Merge branch 'master' into pre/1.13
* master: Fix bug in last patch Ensure chunks are always loaded on hard position sets Improve Watchdog Early Warning Feature - Closes #1319 Allow disabling armour stand ticking
This commit is contained in:
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
|
||||
Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||
index d0d86e1a..253f0c2d 100644
|
||||
index d0d86e1a4..253f0c2d5 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
Reference in New Issue
Block a user