mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-08 16:12:18 -07:00
Update to Minecraft 1.13.1
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user