Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-07-25 05:35:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #152 from DemonWav/blockPosInfLoop

Browse Source 
Prevent possible infinite loop in BlockPosition iterator
This commit is contained in:
Zach 2016-03-26 22:30:04 -05:00
commit c3b869fdf2
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Spigot-Server-Patches/0111-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch Normal file
View File

@ -0,0 +1,52 @@
From 74052653db4261320e163b29c7d7e526cb0f5d99 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Sat, 26 Mar 2016 21:36:05 -0500
Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 2d56f02..84e862b 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -139,15 +139,17 @@ public class BlockPosition extends BaseBlockPosition {
protected BlockPosition a() {
if (this.b == null) {
- this.b = blockposition;
+ this.b = blockposition2; // 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) 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()) {
@@ -158,6 +160,18 @@ 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
this.b = new BlockPosition(i, j, k);
return this.b;
--
2.7.4