Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

PaperMC - Buffer joins

Browse Source
This commit is contained in:
William Blake Galbreath
2020-08-04 20:39:00 -05:00
parent 3861e41bbc
commit ae51c1626e
3 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -1623,7 +1623,7 @@ index ed9b2f9adf..d54bf71409 100644
return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ;
}
diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
index 3b0c8971c6..4816493c6a 100644
index 3b0c8971c6..e69b7dbc7a 100644
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
+++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -16,9 +16,9 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -1633,9 +1633,9 @@ index 3b0c8971c6..4816493c6a 100644
- private int a;public final void setX(final int x) { this.a = x; } // Paper - OBFHELPER
- private int b;public final void setY(final int y) { this.b = y; } // Paper - OBFHELPER
- private int e;public final void setZ(final int z) { this.e = z; } // Paper - OBFHELPER
+ protected int a;public final void setX(final int x) { this.a = x; } // Paper - OBFHELPER // Tuinity - private->protected
+ protected int b;public final void setY(final int y) { this.b = y; } // Paper - OBFHELPER // Tuinity - private->protected
+ protected int e;public final void setZ(final int z) { this.e = z; } // Paper - OBFHELPER // Tuinity - private->protected
+ protected int a; // Paper - OBFHELPER // Tuinity - private->protected - diff on change, this is the x coordinate - Also revert the decision to expose set on an immutable type
+ protected int b; // Paper - OBFHELPER // Tuinity - private->protected - diff on change, this is the y coordinate - Also revert the decision to expose set on an immutable type
+ protected int e; // Paper - OBFHELPER // Tuinity - private->protected - diff on change, this is the z coordinate - Also revert the decision to expose set on an immutable type
// Paper start
public boolean isValidLocation() {
@@ -1902,7 +1902,7 @@ index 4bf66420f5..bf76615d72 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index a2ee39b7ef..7bdefff433 100644
index a2ee39b7ef..c77f71b6de 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -387,10 +387,10 @@ public class BlockPosition extends BaseBlockPosition {
@@ -1957,27 +1957,41 @@ index a2ee39b7ef..7bdefff433 100644
}
public BlockPosition.MutableBlockPosition c(EnumDirection enumdirection, int i) {
@@ -445,21 +454,19 @@ public class BlockPosition extends BaseBlockPosition {
@@ -445,21 +454,30 @@ public class BlockPosition extends BaseBlockPosition {
}
}
- /* // Paper start - comment out useless overrides @Override
- @Override
+ // Tuinity start
public void o(int i) {
- public void o(int i) {
- super.o(i);
+ setX(i);
+ // Tuinity start
+ // only expose set on the mutable blockpos
+ public final void setX(int value) {
+ ((BaseBlockPosition)this).a = value;
+ }
+ public final void setY(int value) {
+ ((BaseBlockPosition)this).b = value;
+ }
+ public final void setZ(int value) {
+ ((BaseBlockPosition)this).e = value;
}
- @Override
public void p(int i) {
- public void p(int i) {
- super.p(i);
+ setY(i);
+ public final void o(int i) {
+ ((BaseBlockPosition)this).a = i; // need cast thanks to name conflict
+ }
+
+ public final void p(int i) {
+ ((BaseBlockPosition)this).b = i;
}
public void q(int i) {
- public void q(int i) {
- super.q(i);
+ setZ(i);
+ public final void q(int i) {
+ ((BaseBlockPosition)this).e = i;
}
- */ // Paper end
+ // Tuinity end