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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
3dc4cdcd Update to Minecraft 1.14.3-pre4
88b25a8c SPIGOT-5098: Add a method to allow colored sign changes
6d913552 Update to Minecraft 1.14.3-pre4

CraftBukkit Changes:
f1f33559 Update to Minecraft 1.14.3
8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes
533290e2 SPIGOT-5100: Console warning from pig zombie targeting
6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants
9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working
38fa220f Fix setting game rules via the API
fe3930ce Update to Minecraft 1.14.3-pre4
da071ec5 Remove outdated build delay.

Spigot Changes:
4d2f30f1 Update to Minecraft 1.14.3
f16400e3 Update to Minecraft 1.14.3-pre4
This commit is contained in:
Shane Freeder
2019-06-25 02:47:58 +01:00
parent 651932f299
commit 40748b3c8d
166 changed files with 783 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
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 89792eec45..e4eecf5688 100644
index 013b3a1ca8..0037d13806 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,23 +17,23 @@ index 89792eec45..e4eecf5688 100644
this.datawatcher.set(EntityTurtle.bA, blockposition);
}
+ public BlockPosition getHome() { return dX(); } // Paper - OBFHELPER
private BlockPosition dX() {
+ public BlockPosition getHome() { return dY(); } // Paper - OBFHELPER
private BlockPosition dY() {
return (BlockPosition) this.datawatcher.get(EntityTurtle.bA);
}
+ public void setTravelPos(BlockPosition pos) { h(pos); } // Paper - OBFHELPER
private void h(BlockPosition blockposition) {
this.datawatcher.set(EntityTurtle.bE, blockposition);
this.datawatcher.set(EntityTurtle.bD, blockposition);
}
+ public BlockPosition getTravelPos() { return dY(); } // Paper - OBFHELPER
private BlockPosition dY() {
return (BlockPosition) this.datawatcher.get(EntityTurtle.bE);
+ public BlockPosition getTravelPos() { return dZ(); } // Paper - OBFHELPER
private BlockPosition dZ() {
return (BlockPosition) this.datawatcher.get(EntityTurtle.bD);
}
+ public boolean hasEgg() { return dV(); } // Paper - OBFHELPER
public boolean dV() {
+ public boolean hasEgg() { return dW(); } // Paper - OBFHELPER
public boolean dW() {
return (Boolean) this.datawatcher.get(EntityTurtle.bB);
}
@@ -43,42 +43,42 @@ index 89792eec45..e4eecf5688 100644
}
+ public boolean isDigging() { return dW(); } // Paper - OBFHELPER
public boolean dW() {
return (Boolean) this.datawatcher.get(EntityTurtle.bD);
public boolean dX() {
return (Boolean) this.datawatcher.get(EntityTurtle.bC);
}
+ public void setDigging(boolean digging) { s(digging); } // Paper - OBFHELPER
private void s(boolean flag) {
this.bH = flag ? 1 : 0;
this.datawatcher.set(EntityTurtle.bD, flag);
this.bG = flag ? 1 : 0;
this.datawatcher.set(EntityTurtle.bC, flag);
}
+ public boolean isGoingHome() { return dZ(); } // Paper - OBFHELPER
private boolean dZ() {
return (Boolean) this.datawatcher.get(EntityTurtle.bF);
+ public boolean isGoingHome() { return ea(); } // Paper - OBFHELPER
private boolean ea() {
return (Boolean) this.datawatcher.get(EntityTurtle.bE);
}
+ public void setGoingHome(boolean goingHome) { t(goingHome); } // Paper - OBFHELPER
private void t(boolean flag) {
this.datawatcher.set(EntityTurtle.bF, flag);
this.datawatcher.set(EntityTurtle.bE, flag);
}
+ public boolean isTravelling() { return ee(); } // Paper - OBFHELPER
private boolean ee() {
return (Boolean) this.datawatcher.get(EntityTurtle.bG);
+ public boolean isTravelling() { return ef(); } // Paper - OBFHELPER
private boolean ef() {
return (Boolean) this.datawatcher.get(EntityTurtle.bF);
}
+ public void setTravelling(boolean travelling) { u(travelling); } // Paper - OBFHELPER
private void u(boolean flag) {
this.datawatcher.set(EntityTurtle.bG, flag);
this.datawatcher.set(EntityTurtle.bF, flag);
}
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
if (!this.g.isInWater() && this.k()) {
if (this.g.bH < 1) {
if (this.g.bG < 1) {
- this.g.s(true);
+ this.g.setDigging(new com.destroystokyo.paper.event.entity.TurtleStartDiggingEvent((org.bukkit.entity.Turtle) this.g.getBukkitEntity(), MCUtil.toLocation(this.g.world, this.e)).callEvent()); // Paper
} else if (this.g.bH > 200) {
} else if (this.g.bG > 200) {
World world = this.g.world;
// CraftBukkit start
@@ -98,8 +98,8 @@ index 89792eec45..e4eecf5688 100644
@Override
public boolean a() {
- return this.a.isBaby() ? false : (this.a.dV() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : !this.a.dX().a((IPosition) this.a.ch(), 64.0D)));
+ return this.a.isBaby() ? false : (this.a.dV() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : !this.a.dX().a((IPosition) this.a.ch(), 64.0D))) && new com.destroystokyo.paper.event.entity.TurtleGoHomeEvent((org.bukkit.entity.Turtle) this.a.getBukkitEntity()).callEvent(); // Paper;
- return this.a.isBaby() ? false : (this.a.dW() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : !this.a.dY().a((IPosition) this.a.ci(), 64.0D)));
+ return this.a.isBaby() ? false : (this.a.dW() ? true : (this.a.getRandom().nextInt(700) != 0 ? false : !this.a.dY().a((IPosition) this.a.ci(), 64.0D))) && new com.destroystokyo.paper.event.entity.TurtleGoHomeEvent((org.bukkit.entity.Turtle) this.a.getBukkitEntity()).callEvent(); // Paper
}
@Override