Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/EntityPig.java
+++ b/net/minecraft/server/EntityPig.java
@@ -4,6 +4,8 @@
import java.util.Set;
@@ -2,6 +2,8 @@
import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
public class EntityPig extends EntityAnimal {
private static final DataWatcherObject<Boolean> bx = DataWatcher.a(EntityPig.class, DataWatcherRegistry.h);
@@ -124,13 +126,14 @@
private static final DataWatcherObject<Boolean> bC = DataWatcher.a(EntityPig.class, DataWatcherRegistry.i);
@@ -118,13 +120,14 @@
}
public void die(DamageSource damagesource) {
@@ -17,7 +17,7 @@
+ // super.die(damagesource); // CraftBukkit - Moved to end
if (!this.world.isClientSide) {
if (this.hasSaddle()) {
this.a(Items.SADDLE, 1);
this.a((IMaterial) Items.SADDLE);
}
}
@@ -25,7 +25,7 @@
}
@Nullable
@@ -155,6 +158,12 @@
@@ -149,6 +152,12 @@
if (!this.world.isClientSide && !this.dead) {
EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
@@ -38,7 +38,7 @@
entitypigzombie.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
entitypigzombie.setNoAI(this.isNoAI());
@@ -163,7 +172,8 @@
@@ -157,7 +166,8 @@
entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
}