SteamWar/Paper
11
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

20
Spigot-Server-Patches/SkeletonHorse-Additions.patch
View File

@@ -5,15 +5,15 @@ Subject: [PATCH] SkeletonHorse Additions
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 9ac34dfa8c..b967264562 100644
index c9f0973031..d281195834 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -0,0 +0,0 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
private final PathfinderGoalHorseTrap bJ = new PathfinderGoalHorseTrap(this);
private boolean bK;
- private int bL;
+ private int bL; public int getTrapTime() { return this.bL; } // Paper - OBFHELPER
private final PathfinderGoalHorseTrap bI = new PathfinderGoalHorseTrap(this);
private boolean bJ;
- private int bK;
+ private int bK;public int getTrapTime() { return this.bK; } // Paper - OBFHELPER
public EntityHorseSkeleton(EntityTypes<? extends EntityHorseSkeleton> entitytypes, World world) {
super(entitytypes, world);
@@ -21,15 +21,15 @@ index 9ac34dfa8c..b967264562 100644
return 0.96F;
}
+ public boolean isTrap() { return this.dV(); } // Paper - OBFHELPER
public boolean dV() {
return this.bK;
+ public boolean isTrap() { return this.dW(); } // Paper - OBFHELPER
public boolean dW() {
return this.bJ;
}
+ public void setTrap(boolean trap) { this.r(trap); } // Paper - OBFHELPER
public void r(boolean flag) {
if (flag != this.bK) {
this.bK = flag;
if (flag != this.bJ) {
this.bJ = flag;
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
index 7b0a6f82fb..f093744136 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java