44 Zeilen
1.6 KiB
Diff
44 Zeilen
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Thu, 24 May 2018 21:01:13 -0400
|
||
|
|
Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
|
||
|
|
|
||
|
|
Convert location objects to their block coordinates, or the center of the block
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||
|
|
index 6c8b8eddcdb81f7151202eb12541308040790d45..f61bf28afe99f83cdac6490bcc114509698d0aad 100644
|
||
|
|
--- a/src/main/java/org/bukkit/Location.java
|
||
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
||
|
|
@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
|
||
|
|
+
|
||
|
|
+ // Paper start
|
||
|
|
+ /**
|
||
|
|
+ * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ public Location toBlockLocation() {
|
||
|
|
+ Location blockLoc = clone();
|
||
|
|
+ blockLoc.setX(getBlockX());
|
||
|
|
+ blockLoc.setY(getBlockY());
|
||
|
|
+ blockLoc.setZ(getBlockZ());
|
||
|
|
+ return blockLoc;
|
||
|
|
+ }
|
||
|
|
+ /**
|
||
|
|
+ * @return A new location where X/Y/Z are the center of the block
|
||
|
|
+ */
|
||
|
|
+ @NotNull
|
||
|
|
+ public Location toCenterLocation() {
|
||
|
|
+ Location centerLoc = clone();
|
||
|
|
+ centerLoc.setX(getBlockX() + 0.5);
|
||
|
|
+ centerLoc.setY(getBlockY() + 0.5);
|
||
|
|
+ centerLoc.setZ(getBlockZ() + 0.5);
|
||
|
|
+ return centerLoc;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
@Override
|
||
|
|
public boolean equals(Object obj) {
|
||
|
|
if (obj == null) {
|