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

Update for Minecraft 1.13.2

Browse Source
This commit is contained in:
Shane Freeder
2018-10-23 00:16:21 +01:00
parent f20d327458
commit 18ac1d68c0
106 changed files with 433 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/Turtle-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index 4f5592d1..981a025e 100644
index 7ac07ac07ac0..7ac07ac07ac0 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
@@ -17,8 +17,8 @@ index 4f5592d1..981a025e 100644
this.datawatcher.set(EntityTurtle.bD, blockposition);
}
+ public BlockPosition getHome() { return dB(); } // Paper - OBFHELPER
private BlockPosition dB() {
+ public BlockPosition getHome() { return dA(); } // Paper - OBFHELPER
private BlockPosition dA() {
return (BlockPosition) this.datawatcher.get(EntityTurtle.bD);
}
@@ -27,8 +27,8 @@ index 4f5592d1..981a025e 100644
this.datawatcher.set(EntityTurtle.bH, blockposition);
}
+ public BlockPosition getTravelPos() { return dC(); } // Paper - OBFHELPER
private BlockPosition dC() {
+ public BlockPosition getTravelPos() { return dB(); } // Paper - OBFHELPER
private BlockPosition dB() {
return (BlockPosition) this.datawatcher.get(EntityTurtle.bH);
}
@@ -53,8 +53,8 @@ index 4f5592d1..981a025e 100644
this.datawatcher.set(EntityTurtle.bG, Boolean.valueOf(flag));
}
+ public boolean isGoingHome() { return dH(); } // Paper - OBFHELPER
private boolean dH() {
+ public boolean isGoingHome() { return dC(); } // Paper - OBFHELPER
private boolean dC() {
return ((Boolean) this.datawatcher.get(EntityTurtle.bI)).booleanValue();
}
@@ -63,8 +63,8 @@ index 4f5592d1..981a025e 100644
this.datawatcher.set(EntityTurtle.bI, Boolean.valueOf(flag));
}
+ public boolean isTravelling() { return dI(); } // Paper - OBFHELPER
private boolean dI() {
+ public boolean isTravelling() { return dH(); } // Paper - OBFHELPER
private boolean dH() {
return ((Boolean) this.datawatcher.get(EntityTurtle.bJ)).booleanValue();
}
@@ -98,13 +98,13 @@ index 4f5592d1..981a025e 100644
}
public boolean a() {
- return this.a.isBaby() ? false : (this.a.dy() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : this.a.c(this.a.dB()) >= 4096.0D));
+ return this.a.isBaby() ? false : (this.a.dy() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : this.a.c(this.a.dB()) >= 4096.0D)) && new com.destroystokyo.paper.event.entity.TurtleGoHomeEvent((org.bukkit.entity.Turtle) this.a.getBukkitEntity()).callEvent(); // Paper
- return this.a.isBaby() ? false : (this.a.dy() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : this.a.c(this.a.dA()) >= 4096.0D));
+ return this.a.isBaby() ? false : (this.a.dy() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : this.a.c(this.a.dA()) >= 4096.0D)) && new com.destroystokyo.paper.event.entity.TurtleGoHomeEvent((org.bukkit.entity.Turtle) this.a.getBukkitEntity()).callEvent(); // Paper;
}
public void c() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
index 123a2c75..8edcf7af 100644
index 7ac07ac07ac0..7ac07ac07ac0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
@@ -0,0 +0,0 @@