1.16.2 Release (#4123)
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Riley Park <rileysebastianpark@gmail.com> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
This commit is contained in:
@@ -9,61 +9,60 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
--- 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 {
|
||||
public void setHomePos(BlockPosition blockposition) {
|
||||
this.datawatcher.set(EntityTurtle.bw, blockposition);
|
||||
this.datawatcher.set(EntityTurtle.bp, blockposition);
|
||||
}
|
||||
-
|
||||
|
||||
- private BlockPosition getHomePos() {
|
||||
+ public BlockPosition getHomePos() { // Paper - public
|
||||
return (BlockPosition) this.datawatcher.get(EntityTurtle.bw);
|
||||
return (BlockPosition) this.datawatcher.get(EntityTurtle.bp);
|
||||
}
|
||||
|
||||
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bx);
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bq);
|
||||
}
|
||||
|
||||
- private void setHasEgg(boolean flag) {
|
||||
+ public void setHasEgg(boolean flag) { // Paper
|
||||
this.datawatcher.set(EntityTurtle.bx, flag);
|
||||
this.datawatcher.set(EntityTurtle.bq, flag);
|
||||
}
|
||||
|
||||
+ public final boolean isDigging() { return this.eM(); } // Paper - OBFHELPER
|
||||
public boolean eM() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.by);
|
||||
+ public final boolean isDigging() { return this.eL(); } // Paper - OBFHELPER
|
||||
public boolean eL() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.br);
|
||||
}
|
||||
|
||||
+ public final void setDigging(boolean digging) { this.u(digging); } // Paper - OBFHELPER
|
||||
private void u(boolean flag) {
|
||||
this.bC = flag ? 1 : 0;
|
||||
this.datawatcher.set(EntityTurtle.by, flag);
|
||||
this.bv = flag ? 1 : 0;
|
||||
this.datawatcher.set(EntityTurtle.br, flag);
|
||||
}
|
||||
|
||||
+ public final boolean isGoingHome() { return this.eV(); } // Paper - OBFHELPER
|
||||
private boolean eV() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bA);
|
||||
+ public final boolean isGoingHome() { return this.eU(); } // Paper - OBFHELPER
|
||||
private boolean eU() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bt);
|
||||
}
|
||||
|
||||
+ public final void setGoingHome(boolean goingHome) { this.v(goingHome); } // Paper - OBFHELPER
|
||||
private void v(boolean flag) {
|
||||
this.datawatcher.set(EntityTurtle.bA, flag);
|
||||
this.datawatcher.set(EntityTurtle.bt, flag);
|
||||
}
|
||||
|
||||
+ public final boolean isTravelling() { return this.eW(); } // Paper - OBFHELPER
|
||||
private boolean eW() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bB);
|
||||
+ public final boolean isTravelling() { return this.eV(); } // Paper - OBFHELPER
|
||||
private boolean eV() {
|
||||
return (Boolean) this.datawatcher.get(EntityTurtle.bu);
|
||||
}
|
||||
|
||||
+ public final void setTravelling(boolean travelling) { this.w(travelling); } // Paper - OBFHELPER
|
||||
private void w(boolean flag) {
|
||||
this.datawatcher.set(EntityTurtle.bB, flag);
|
||||
this.datawatcher.set(EntityTurtle.bu, flag);
|
||||
}
|
||||
@@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
|
||||
|
||||
if (!this.g.isInWater() && this.k()) {
|
||||
if (this.g.bC < 1) {
|
||||
if (!this.g.isInWater() && this.l()) {
|
||||
if (this.g.bv < 1) {
|
||||
- this.g.u(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.bC > 200) {
|
||||
+ this.g.setDigging(new com.destroystokyo.paper.event.entity.TurtleStartDiggingEvent((org.bukkit.entity.Turtle) this.g.getBukkitEntity(), MCUtil.toLocation(this.g.world, this.getTargetPosition())).callEvent()); // Paper
|
||||
} else if (this.g.bv > 200) {
|
||||
World world = this.g.world;
|
||||
|
||||
// CraftBukkit start
|
||||
@@ -87,6 +86,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
|
||||
@@ -0,0 +0,0 @@ public abstract class PathfinderGoalGotoTarget extends PathfinderGoal {
|
||||
protected int c;
|
||||
protected int d;
|
||||
private int g;
|
||||
- protected BlockPosition e;
|
||||
+ protected BlockPosition e;public final BlockPosition getTargetPosition() { return this.e; } // Paper - OBFHELPER
|
||||
private boolean h;
|
||||
private final int i;
|
||||
private final int j;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
||||
|
||||
Reference in New Issue
Block a user