1.修复孙坚大招伤害问题

Author: Misakait

src/main/java/xyz/lisbammisakait/RelightTheThreePointStrategy.java

@@ -59,6 +59,7 @@ public class RelightTheThreePointStrategy implements ModInitializer {
 	// That way, it's clear which mod wrote info, warnings, and errors.
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	private boolean isMapBinding = false;
+	private int gameStatus = 0;
 	@Override
 	public void onInitialize() {
         // This code runs as soon as Minecraft is in a mod-load-ready state.
@@ -184,6 +185,7 @@ private void respawnPlayer(ServerPlayerEntity player) {
 			player.setHealth(player.getMaxHealth());
 			player.clearStatusEffects();
 			player.setOnFire(false);
+			player.setFireTicks(0);
 			ServerWorld world = player.getServer().getWorld(player.getWorld().getRegistryKey());
 			player.teleport(world, 0, 257, -2, Collections.emptySet(), 0, 0, false);
 			player.getServer().getPlayerManager().getPlayerList().forEach(Notifiee -> {
@@ -263,21 +265,16 @@ private void changeGameStatus(MinecraftServer server){
 //					}
 //				});
 			scoreAccess.setScore(-1);
+			gameStatus = -1;
 		}
 	}
 	private void createScoreboard(MinecraftServer server) {
 		Scoreboard scoreboard = server.getScoreboard();
 		if(scoreboard.getNullableObjective("isGameStarted")==null){
 			scoreboard.addObjective("isGameStarted", ScoreboardCriterion.DUMMY, Text.of("游戏是否开始"), ScoreboardCriterion.RenderType.INTEGER,true,null);
 		}
-		if(scoreboard.getNullableObjective("genRandom")==null){
-			scoreboard.addObjective("genRandom", ScoreboardCriterion.DUMMY, Text.of("生成随机数"), ScoreboardCriterion.RenderType.INTEGER,true,null);
-		}
 		ScoreboardObjective respawnCountSBO = scoreboard.getNullableObjective("isGameStarted");
 		ScoreAccess scoreAccess = scoreboard.getOrCreateScore(() -> "gameStarted", respawnCountSBO);
-
-		ScoreboardObjective randomSBO = scoreboard.getNullableObjective("genRandom");
-		ScoreAccess randomScoreAccess = scoreboard.getOrCreateScore(() -> "Random", respawnCountSBO);
 		scoreAccess.setScore(0);
 	}
 
@@ -288,6 +285,9 @@ private void useSkill(MinecraftServer server, ServerPlayerEntity player, int slo
 			RelightTheThreePointStrategy.LOGGER.info("并非技能物品");
 			return;
 		}
+		if(gameStatus!=-1){
+			return;
+		}
 		ActiveSkillable skill = (ActiveSkillable) skillStack.getItem();
 		skill.castSkill(server,player,skillStack);
 	}

src/main/java/xyz/lisbammisakait/item/RtTPSSwordItem.java

@@ -6,6 +6,7 @@
 import net.minecraft.entity.attribute.EntityAttributeInstance;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.player.HungerManager;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.SwordItem;

src/main/java/xyz/lisbammisakait/skill/SunJianASkill.java

@@ -3,6 +3,7 @@
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.CustomModelDataComponent;
 import net.minecraft.entity.damage.DamageType;
+import net.minecraft.entity.damage.DamageTypes;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
@@ -14,6 +15,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec3d;
 import xyz.lisbammisakait.RelightTheThreePointStrategy;
 import xyz.lisbammisakait.compoennt.RtTPSComponents;
@@ -78,10 +80,18 @@ public void processPracticalSkill(MinecraftServer server, ServerPlayerEntity ser
                     DamageSource damageSource = new DamageSource(, serverplayer);
                     targetPlayer.damage(world, damageSource,40);*/
                     ServerWorld world = (ServerWorld) serverplayer.getWorld();
+//                    DamageSource damageSource = new DamageSource(serverplayer.getRegistryManager()
+//                            .getOrThrow(RegistryKeys.DAMAGE_TYPE)
+//                            .getEntry(new DamageType("player",0.0F)),serverplayer,serverplayer);Identifier.ofVanilla("player_attack")
                     DamageSource damageSource = new DamageSource(serverplayer.getRegistryManager()
                             .getOrThrow(RegistryKeys.DAMAGE_TYPE)
-                            .getEntry(new DamageType("player",0.0F)));
+                            .getEntry(Identifier.ofVanilla("player_attack")).get(),serverplayer,serverplayer);
                     targetPlayer.damage(world, damageSource,40F);
+
+//                    DamageSource damageSource2 = new DamageSource(serverplayer.getRegistryManager()
+//                            .getOrThrow(RegistryKeys.DAMAGE_TYPE)
+//                            .getEntry(DamageTypes.GENERIC_KILL.getRegistry()),serverplayer,serverplayer);
+
                 }
             }
         }