Update to Minecraft 1.14.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/EntityTypes.java
+++ b/net/minecraft/server/EntityTypes.java
@@ -131,7 +131,7 @@
private final Type<?> bh;
@@ -129,7 +129,7 @@
private MinecraftKey bh;
private final EntitySize bi;
- private static <T extends Entity> EntityTypes<T> a(String s, EntityTypes.a<T> entitytypes_a) {
@@ -9,7 +9,7 @@
return (EntityTypes) IRegistry.a((IRegistry) IRegistry.ENTITY_TYPE, s, (Object) entitytypes_a.a(s));
}
@@ -160,10 +160,16 @@
@@ -158,10 +158,16 @@
@Nullable
public T spawnCreature(World world, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1) {
@@ -28,7 +28,7 @@
}
@Nullable
@@ -325,7 +331,7 @@
@@ -327,7 +333,7 @@
}
return entity;
@@ -37,7 +37,7 @@
}
private static Optional<Entity> b(NBTTagCompound nbttagcompound, World world) {
@@ -342,7 +348,8 @@
@@ -344,7 +350,8 @@
}
public int getUpdateInterval() {
@@ -47,8 +47,8 @@
}
public boolean isDeltaTracking() {
@@ -372,7 +379,7 @@
this.b = enumcreaturetype;
@@ -376,7 +383,7 @@
this.f = enumcreaturetype == EnumCreatureType.CREATURE || enumcreaturetype == EnumCreatureType.MISC;
}
- public static <T extends Entity> EntityTypes.a<T> a(EntityTypes.b<T> entitytypes_b, EnumCreatureType enumcreaturetype) {