Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-02 11:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #155 from DemonWav/otherBlockPosFix

Browse Source 
Add same infi-loop fix to other identical block of code I missed earlier
This commit is contained in:
Riley Park 2016-03-27 03:45:56 -07:00
commit bba407aa46
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Spigot-Server-Patches/Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
View File

@ -47,4 +47,43 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.b = new BlockPosition(i, j, k); this.b = new BlockPosition(i, j, k);
return this.b; return this.b;
@@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
protected BlockPosition.MutableBlockPosition a() {
if (this.b == null) {
- this.b = new BlockPosition.MutableBlockPosition(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ this.b = new BlockPosition.MutableBlockPosition(blockposition2.getX(), blockposition2.getY(), blockposition2.getZ()); // Paper - use blockposition2 instead of blockposition to prevent infinite loops
return this.b;
- } else if (this.b.equals(blockposition1)) {
+ } else if (this.b.equals(blockposition3)) { // Paper - use blockposition3 instead of blockposition1 to prevent infinite loops
return (BlockPosition.MutableBlockPosition) this.endOfData();
} else {
int i = this.b.getX();
int j = this.b.getY();
int k = this.b.getZ();
+ // Paper start - use blockposition2 and blockposition3 to prevent infinite loops
+ /*
if (i < blockposition1.getX()) {
++i;
} else if (j < blockposition1.getY()) {
@@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
j = blockposition.getY();
++k;
}
+ */
+ if (i < blockposition3.getX()) {
+ ++i;
+ } else if (j < blockposition3.getY()) {
+ i = blockposition2.getX();
+ ++j;
+ } else if (k < blockposition3.getZ()) {
+ i = blockposition2.getX();
+ j = blockposition2.getY();
+ ++k;
+ }
+ // Paper end
// Paper start - modify base position variables
((BaseBlockPosition) this.b).a = i;
-- --