Merge branch 'master' into ver/1.14
This commit is contained in:
commit
70e671043a
14 changed files with 15 additions and 46 deletions
|
@ -20,7 +20,7 @@ index ad58d4fd63..c04d73e738 100644
|
|||
|
||||
if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 073400f23f..e18ae24bf8 100644
|
||||
index 3ebea96931..174d2d4ea0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue