OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 00:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

rename method for center to toCenterLocation()

Browse source
This commit is contained in:
Aikar 2018-05-24 21:06:06 -04:00
parent 45308a08d7
commit dab41b12ce
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Spigot-API-Patches/0107-Location.toBlockLocation.patch → Spigot-API-Patches/0107-Location.toBlockLocation-toCenterLocation.patch
View file

@ -1,15 +1,15 @@
From 33768a6eb01492a7ce72ab71a02afcf32ee8186b Mon Sep 17 00:00:00 2001 From c338a85f88b3d3746f11058714d76e5a963f8847 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 24 May 2018 21:01:13 -0400 Date: Thu, 24 May 2018 21:01:13 -0400
Subject: [PATCH] Location.toBlockLocation Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
Convert location objects to their block coordinates, or the center of the block 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 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 1ddebf3c..5c70e80d 100644 index 1ddebf3c..916238c4 100644
--- a/src/main/java/org/bukkit/Location.java --- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java
@@ -492,6 +492,31 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -492,6 +492,29 @@ public class Location implements Cloneable, ConfigurationSerializable {
} }
public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
@ -19,24 +19,22 @@ index 1ddebf3c..5c70e80d 100644
+ * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) + * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
+ */ + */
+ public Location toBlockLocation() { + public Location toBlockLocation() {
+ return toBlockLocation(false);
+ }
+ /**
+ * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z), or optionally the center
+ */
+ public Location toBlockLocation(boolean center) {
+ Location blockLoc = clone(); + Location blockLoc = clone();
+ if (center) {
+ blockLoc.setX(getBlockX() + 0.5);
+ blockLoc.setY(getBlockY() + 0.5);
+ blockLoc.setZ(getBlockZ() + 0.5);
+ } else {
+ blockLoc.setX(getBlockX()); + blockLoc.setX(getBlockX());
+ blockLoc.setY(getBlockY()); + blockLoc.setY(getBlockY());
+ blockLoc.setZ(getBlockZ()); + blockLoc.setZ(getBlockZ());
+ }
+ return blockLoc; + return blockLoc;
+ } + }
+ /**
+ * @return A new location where X/Y/Z are the center of the block
+ */
+ 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 + // Paper end
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {