mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove non-zero BlockIterator block and Loading chunks earlier in player TP patches

Browse source 
Allowing only non-zero BlockIterators breaks an API contract explicitly allowing them
(*eyeroll*)

And loading chunks earlier in the TP patch did not resolve the original issue, and now
that it is resolved, shouldn't actually provide any tangible benefits
This commit is contained in:
Zach Brown 2016-04-18 09:40:58 -05:00
parent ce9e19cfed
commit 68cdc4fa90
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
2 changed files with 0 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Spigot-API-Patches/0036-Only-allow-non-zero-maxDistance-BlockIterators.patch
View file

@ -1,23 +0,0 @@
From 74c1e1dfd8eaaa86e68838b823ebd5177f007066 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 12 Apr 2016 23:06:56 -0500
Subject: [PATCH] Only allow non-zero maxDistance BlockIterators
They can iterate infinitely causing the server to hang.
Fix your plugins!
diff --git a/src/main/java/org/bukkit/util/BlockIterator.java b/src/main/java/org/bukkit/util/BlockIterator.java
index 5c85778..0f34c66 100644
--- a/src/main/java/org/bukkit/util/BlockIterator.java
+++ b/src/main/java/org/bukkit/util/BlockIterator.java
@@ -52,6 +52,7 @@ public class BlockIterator implements Iterator<Block> {
*
*/
public BlockIterator(World world, Vector start, Vector direction, double yOffset, int maxDistance) {
+ com.google.common.base.Preconditions.checkArgument(maxDistance != 0, "maxDistance cannot be 0!"); // Paper - Only allow non-zero maxDistance
this.world = world;
this.maxDistance = maxDistance;
--
2.8.0