Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -1,15 +1,15 @@
--- a/net/minecraft/server/EntityTypes.java
+++ b/net/minecraft/server/EntityTypes.java
@@ -129,7 +129,7 @@
private MinecraftKey bh;
private final EntitySize bi;
@@ -130,7 +130,7 @@
private MinecraftKey bi;
private final EntitySize bj;
- private static <T extends Entity> EntityTypes<T> a(String s, EntityTypes.a<T> entitytypes_a) {
+ private static <T extends Entity> EntityTypes<T> a(String s, EntityTypes.a entitytypes_a) { // CraftBukkit - decompile error
return (EntityTypes) IRegistry.a((IRegistry) IRegistry.ENTITY_TYPE, s, (Object) entitytypes_a.a(s));
}
@@ -158,10 +158,16 @@
@@ -159,10 +159,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
@@ -327,7 +333,7 @@
@@ -328,7 +334,7 @@
}
return entity;
@@ -37,7 +37,7 @@
}
private static Optional<Entity> b(NBTTagCompound nbttagcompound, World world) {
@@ -344,7 +350,8 @@
@@ -345,7 +351,8 @@
}
public int getUpdateInterval() {
@@ -47,7 +47,7 @@
}
public boolean isDeltaTracking() {
@@ -376,7 +383,7 @@
@@ -377,7 +384,7 @@
this.f = enumcreaturetype == EnumCreatureType.CREATURE || enumcreaturetype == EnumCreatureType.MISC;
}