twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-09-01 04:43:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nms-patches/EntityShulker.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/EntityShulker.java
+++ b/net/minecraft/server/EntityShulker.java
@@ -6,6 +6,10 @@
import java.util.List;
import java.util.UUID;
import java.util.function.Predicate;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Location;
@@ -11,19 +11,10 @@
public class EntityShulker extends EntityGolem implements IMonster {
@@ -112,7 +116,7 @@
this.datawatcher.set(EntityShulker.b, Optional.of(new BlockPosition(i, j, k)));
} else {
- this.datawatcher.set(EntityShulker.b, Optional.absent());
+ this.datawatcher.set(EntityShulker.b, Optional.<BlockPosition>absent());
}
}
@@ -331,8 +335,17 @@
@@ -326,8 +330,17 @@
EnumDirection enumdirection = aenumdirection[k];
if (this.world.d(blockposition1.shift(enumdirection), false)) {
if (this.world.q(blockposition1.shift(enumdirection))) {
- this.datawatcher.set(EntityShulker.a, enumdirection);
- flag = true;
+ // CraftBukkit start