更新模板实体数据

wode490390 · wode490390 · commit 64f08bc5ba2e · 2024-04-10T12:27:41.000+08:00
diff --git a/src/main/java/cn/nukkit/block/BlockAnvil.java b/src/main/java/cn/nukkit/block/BlockAnvil.java
@@ -93,7 +93,7 @@ public String getName() {
     @Override
     public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) {
         int damage = this.getDamage();
-        this.setDamage(FACES[player != null ? player.getDirection().getHorizontalIndex() : 0]);
+        this.setDamage(FACES[player != null ? player.getDirection().getOpposite().getHorizontalIndex() : 0]);
         if (damage >= 4 && damage <= 7) {
             this.setDamage(this.getDamage() | 0x04);
         } else if (damage >= 8 && damage <= 11) {
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java b/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -25,6 +27,7 @@ public EntityBlaze(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(20);
+        fireProof = true;
     }
 
     @Override
@@ -42,6 +45,14 @@ public String getName() {
         return "Blaze";
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java b/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java
@@ -3,6 +3,8 @@
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
 import cn.nukkit.entity.attribute.Attribute;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.network.protocol.AddEntityPacket;
@@ -38,6 +40,7 @@ public float getHeight() {
     public void initEntity() {
         super.initEntity();
         this.setMaxHealth(200);
+        fireProof = true;
     }
 
     @Override
@@ -91,4 +94,12 @@ public boolean canBeAffected(int effectId) {
     protected float getKnockbackResistance() {
         return 1;
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityGhast.java b/src/main/java/cn/nukkit/entity/mob/EntityGhast.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -28,6 +30,7 @@ public EntityGhast(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(10);
+        fireProof = true;
     }
 
     @Override
@@ -64,4 +67,12 @@ public Item[] getDrops() {
                 Item.get(Item.GUNPOWDER, 0, random.nextInt(3)),
         };
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java b/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java
@@ -3,6 +3,8 @@
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
 import cn.nukkit.entity.attribute.Attribute;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -94,4 +96,12 @@ public Item[] getDrops() {
     protected float getKnockbackResistance() {
         return 1;
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java b/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -26,6 +28,7 @@ public EntityMagmaCube(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(4);
+        fireProof = true;
     }
 
     @Override
@@ -65,4 +68,12 @@ public void spawnTo(Player player) {
     public int getBaseArmorValue() {
         return 3 * getDataPropertyInt(DATA_VARIANT);
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java b/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java
@@ -3,6 +3,8 @@
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
 import cn.nukkit.entity.EntitySmite;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -51,6 +53,14 @@ public Item[] getDrops() {
         };
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityShulker.java b/src/main/java/cn/nukkit/entity/mob/EntityShulker.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -28,6 +30,7 @@ public EntityShulker(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(30);
+        fireProof = true;
     }
 
     @Override
@@ -71,4 +74,12 @@ public int getBaseArmorValue() {
         }
         return 0;
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java b/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -38,6 +40,14 @@ protected void initEntity() {
         this.setMaxHealth(4);
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityVex.java b/src/main/java/cn/nukkit/entity/mob/EntityVex.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -25,6 +27,7 @@ public int getNetworkId() {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(14);
+        fireProof = true;
     }
 
     @Override
@@ -42,6 +45,14 @@ public String getName() {
         return "Vex";
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWarden.java b/src/main/java/cn/nukkit/entity/mob/EntityWarden.java
@@ -34,6 +34,7 @@ public float getHeight() {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(500);
+        fireProof = true;
     }
 
     @Override
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWither.java b/src/main/java/cn/nukkit/entity/mob/EntityWither.java
@@ -4,6 +4,8 @@
 import cn.nukkit.entity.EntityID;
 import cn.nukkit.entity.EntitySmite;
 import cn.nukkit.entity.attribute.Attribute;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.item.Item;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -41,6 +43,7 @@ public float getHeight() {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(600);
+        fireProof = true;
     }
 
     @Override
@@ -101,4 +104,12 @@ public boolean canBeAffected(int effectId) {
     public int getBaseArmorValue() {
         return 4;
     }
+
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
 }
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java b/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java
@@ -30,6 +30,7 @@ public EntityWitherSkeleton(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(20);
+        fireProof = true;
     }
 
     @Override
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java b/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java
@@ -29,6 +29,7 @@ public EntityZoglin(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(40);
+        fireProof = true;
     }
 
     @Override
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java b/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java
@@ -31,6 +31,7 @@ public EntityZombiePigman(FullChunk chunk, CompoundTag nbt) {
     protected void initEntity() {
         super.initEntity();
         this.setMaxHealth(20);
+        fireProof = true;
     }
 
     @Override
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityAllay.java b/src/main/java/cn/nukkit/entity/passive/EntityAllay.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -39,6 +41,14 @@ public String getName() {
         return "Allay";
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityBat.java b/src/main/java/cn/nukkit/entity/passive/EntityBat.java
@@ -2,6 +2,8 @@
 
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -42,6 +44,14 @@ public void initEntity() {
         this.setMaxHealth(6);
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityBee.java b/src/main/java/cn/nukkit/entity/passive/EntityBee.java
@@ -3,6 +3,8 @@
 import cn.nukkit.Player;
 import cn.nukkit.entity.EntityArthropod;
 import cn.nukkit.entity.EntityID;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.tag.CompoundTag;
 
@@ -44,6 +46,14 @@ protected void initEntity() {
         this.setMaxHealth(10);
     }
 
+    @Override
+    public boolean attack(EntityDamageEvent source) {
+        if (source.getCause() == DamageCause.FALL) {
+            return false;
+        }
+        return super.attack(source);
+    }
+
     @Override
     public void spawnTo(Player player) {
         if (this.hasSpawned.containsKey(player.getLoaderId())) {
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityCat.java b/src/main/java/cn/nukkit/entity/passive/EntityCat.java
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityChicken.java b/src/main/java/cn/nukkit/entity/passive/EntityChicken.java
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java b/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityParrot.java b/src/main/java/cn/nukkit/entity/passive/EntityParrot.java
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityStrider.java b/src/main/java/cn/nukkit/entity/passive/EntityStrider.java
diff --git a/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java b/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public float getHeight() {`
`34`	`34`	`protected void initEntity() {`
`35`	`35`	`super.initEntity();`
`36`	`36`	`this.setMaxHealth(500);`
	`37`	`+ fireProof = true;`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public EntityWitherSkeleton(FullChunk chunk, CompoundTag nbt) {`
`30`	`30`	`protected void initEntity() {`
`31`	`31`	`super.initEntity();`
`32`	`32`	`this.setMaxHealth(20);`
	`33`	`+ fireProof = true;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public EntityZoglin(FullChunk chunk, CompoundTag nbt) {`
`29`	`29`	`protected void initEntity() {`
`30`	`30`	`super.initEntity();`
`31`	`31`	`this.setMaxHealth(40);`
	`32`	`+ fireProof = true;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public EntityZombiePigman(FullChunk chunk, CompoundTag nbt) {`
`31`	`31`	`protected void initEntity() {`
`32`	`32`	`super.initEntity();`
`33`	`33`	`this.setMaxHealth(20);`
	`34`	`+ fireProof = true;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`@Override`