Yank import from last

This commit is contained in:
Zach Brown 2017-01-21 17:12:25 -06:00
parent 3f88bc1ec7
commit 1928933a96
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76

View file

@ -1,21 +1,14 @@
From c6e95d2264c36e04739c97f4e9eb9663e661cbdf Mon Sep 17 00:00:00 2001
From acd9810ba659a1ae7c37cdeaa5b45fa0a1b79ce6 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 21 Jan 2017 16:58:09 -0600
Subject: [PATCH] Expose WorldBorder#isInBounds(Location) method
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java
index e5395a1cc..d2b095e91 100644
index e5395a1cc..92b738c2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java
@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit;
+import net.minecraft.server.BlockPosition;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.WorldBorder;
@@ -108,4 +109,11 @@ public class CraftWorldBorder implements WorldBorder {
@@ -108,4 +108,11 @@ public class CraftWorldBorder implements WorldBorder {
public void setWarningDistance(int distance) {
this.handle.setWarningDistance(distance);
}
@ -23,7 +16,7 @@ index e5395a1cc..d2b095e91 100644
+ // Paper start
+ @Override
+ public boolean isInBounds(Location location) {
+ return this.handle.isInBounds(new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
+ return this.handle.isInBounds(new net.minecraft.server.BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
+ }
+ // Paper end
}