diff options
| author | md_5 <git@md-5.net> | 2018-08-26 12:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-26 12:00:00 +1000 |
| commit | ce1af0c348a8477f9ec58d79e6267e9226dc5dba (patch) | |
| tree | 369972a692f450001c06a13e202d916f9c1bb5a8 /nms-patches/EntityTypes.patch | |
| parent | 162bda93ff76fe96a6138a14176807f21a6ddef4 (diff) | |
| download | craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.gz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.lz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.xz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.zip | |
Update to Minecraft 1.13.1
Diffstat (limited to 'nms-patches/EntityTypes.patch')
| -rw-r--r-- | nms-patches/EntityTypes.patch | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nms-patches/EntityTypes.patch b/nms-patches/EntityTypes.patch index 8b0f7041..25a77d34 100644 --- a/nms-patches/EntityTypes.patch +++ b/nms-patches/EntityTypes.patch @@ -1,6 +1,15 @@ --- a/net/minecraft/server/EntityTypes.java +++ b/net/minecraft/server/EntityTypes.java -@@ -148,10 +148,16 @@ +@@ -121,7 +121,7 @@ + public static <T extends Entity> EntityTypes<T> a(String s, EntityTypes.a<T> entitytypes_a) { + EntityTypes entitytypes = entitytypes_a.a(s); + +- IRegistry.ENTITY_TYPE.a(new MinecraftKey(s), (Object) entitytypes); ++ IRegistry.ENTITY_TYPE.a(new MinecraftKey(s), entitytypes); // CraftBukkit - decompile error + return entitytypes; + } + +@@ -150,10 +150,16 @@ @Nullable public T a(World world, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, boolean flag, boolean flag1) { @@ -19,7 +28,7 @@ } @Nullable -@@ -185,7 +191,7 @@ +@@ -187,7 +193,7 @@ } a(world, entityhuman, entity, nbttagcompound); @@ -28,12 +37,12 @@ } } -@@ -240,7 +246,7 @@ +@@ -250,7 +256,7 @@ @Nullable public T a(World world) { -- return (Entity) this.aU.apply(world); -+ return this.aU.apply(world); // CraftBukkit - decompile error +- return (Entity) this.aT.apply(world); ++ return this.aT.apply(world); // CraftBukkit - decompile error } @Nullable |