Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/EntitySlime.java
+++ b/net/minecraft/server/EntitySlime.java
@@ -1,6 +1,13 @@
package net.minecraft.server;
@@ -2,6 +2,13 @@
import java.util.EnumSet;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.ArrayList;
@@ -14,16 +14,16 @@
public class EntitySlime extends EntityInsentient implements IMonster {
@@ -134,7 +141,7 @@
@@ -138,7 +145,7 @@
@Override
public EntityTypes<? extends EntitySlime> getEntityType() {
- return super.getEntityType();
+ return (EntityTypes<? extends EntitySlime>) super.getEntityType(); // CraftBukkit - decompile error
}
public EntityTypes<? extends EntitySlime> P() {
- return super.P();
+ return (EntityTypes<? extends EntitySlime>) super.P(); // CraftBukkit - decompile error
}
public void die() {
@@ -143,6 +150,19 @@
@Override
@@ -148,6 +155,19 @@
if (!this.world.isClientSide && i > 1 && this.getHealth() <= 0.0F) {
int j = 2 + this.random.nextInt(3);
@@ -43,7 +43,7 @@
for (int k = 0; k < j; ++k) {
float f = ((float) (k % 2) - 0.5F) * (float) i / 4.0F;
float f1 = ((float) (k / 2) - 0.5F) * (float) i / 4.0F;
@@ -158,8 +178,18 @@
@@ -163,8 +183,18 @@
entityslime.setSize(i / 2, true);
entityslime.setPositionRotation(this.locX + (double) f, this.locY + 0.5D, this.locZ + (double) f1, this.random.nextFloat() * 360.0F, 0.0F);