flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue where the sever would freeze if a particle marking a claim boundary was over the void.

Browse Source 
This bug could have caused crashes if a claim was created between islands in the End.
This commit is contained in:
Giraffe1966 2021-02-20 01:48:24 -05:00
parent f1bd1cfea3
commit 0b0dc5b262
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/flemmli97/flan/player/ClaimDisplay.java
View File

@ -69,12 +69,16 @@ public class ClaimDisplay {
}; };
} }
for (int[] pos : this.poss) { for (int[] pos : this.poss) {
if (pos[2] == -1)
continue;
if (pos[1] != pos[2]) if (pos[1] != pos[2])
player.networkHandler.sendPacket(new ParticleS2CPacket(this.corner, true, pos[0] + 0.5, pos[2] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1)); player.networkHandler.sendPacket(new ParticleS2CPacket(this.corner, true, pos[0] + 0.5, pos[2] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1));
player.networkHandler.sendPacket(new ParticleS2CPacket(this.corner, true, pos[0] + 0.5, pos[1] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1)); player.networkHandler.sendPacket(new ParticleS2CPacket(this.corner, true, pos[0] + 0.5, pos[1] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1));
} }
if (this.middlePoss != null) if (this.middlePoss != null)
for (int[] pos : this.middlePoss) { for (int[] pos : this.middlePoss) {
if (pos[2] == -1)
continue;
if (pos[1] != pos[2]) if (pos[1] != pos[2])
player.networkHandler.sendPacket(new ParticleS2CPacket(this.middle, true, pos[0] + 0.5, pos[2] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1)); player.networkHandler.sendPacket(new ParticleS2CPacket(this.middle, true, pos[0] + 0.5, pos[2] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1));
player.networkHandler.sendPacket(new ParticleS2CPacket(this.middle, true, pos[0] + 0.5, pos[1] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1)); player.networkHandler.sendPacket(new ParticleS2CPacket(this.middle, true, pos[0] + 0.5, pos[1] + 0.25, pos[3] + 0.5, 0, 0.5f, 0, 0, 1));
@ -144,6 +148,11 @@ public class ClaimDisplay {
while (state.getMaterial().isReplaceable()) { while (state.getMaterial().isReplaceable()) {
pos = pos.down(); pos = pos.down();
state = world.getBlockState(pos); state = world.getBlockState(pos);
// check if void is reached
if(pos.getY() == -1 && !world.getBlockState(pos.up()).getMaterial().isLiquid())
return new int[]{-1, -1};
else if(pos.getY() == -1)
break;
} }
pos = pos.up(); pos = pos.up();
state = world.getBlockState(pos); state = world.getBlockState(pos);