SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

23
paper-server/nms-patches/EntityShulker.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityShulker.java
+++ b/net/minecraft/server/EntityShulker.java
@@ -5,6 +5,10 @@
@@ -6,6 +6,10 @@
import java.util.Optional;
import java.util.UUID;
import javax.annotation.Nullable;
@@ -11,11 +11,20 @@
public class EntityShulker extends EntityGolem implements IMonster {
@@ -320,8 +324,17 @@
@@ -46,7 +50,7 @@
this.goalSelector.a(4, new EntityShulker.a());
this.goalSelector.a(7, new EntityShulker.e());
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
- this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
+ this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
this.targetSelector.a(2, new EntityShulker.d(this));
this.targetSelector.a(3, new EntityShulker.c(this));
}
@@ -308,8 +312,17 @@
EnumDirection enumdirection = aenumdirection[k];
if (this.world.q(blockposition1.shift(enumdirection))) {
- this.datawatcher.set(EntityShulker.a, enumdirection);
if (this.world.a(blockposition1.shift(enumdirection), (Entity) this)) {
- this.datawatcher.set(EntityShulker.b, enumdirection);
- flag = true;
+ // CraftBukkit start
+ EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), new Location(this.world.getWorld(), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()));
@@ -24,18 +33,18 @@
+ Location to = teleport.getTo();
+ blockposition1 = new BlockPosition(to.getX(), to.getY(), to.getZ());
+
+ this.datawatcher.set(EntityShulker.a, enumdirection);
+ this.datawatcher.set(EntityShulker.b, enumdirection);
+ flag = true;
+ }
+ // CraftBukkit end
break;
}
}
@@ -366,6 +379,7 @@
@@ -354,6 +367,7 @@
this.locX = (double) blockposition.getX() + 0.5D;
this.locY = (double) blockposition.getY();
this.locZ = (double) blockposition.getZ() + 0.5D;
+ if (valid) world.entityJoinedWorld(this, false); // CraftBukkit
+ if (valid) ((WorldServer) world).chunkCheck(this); // CraftBukkit
this.lastX = this.locX;
this.lastY = this.locY;
this.lastZ = this.locZ;