From bff3f5cccd7b4dfdc341af8c96ecf824b1be5bde Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 21 Jan 2017 17:12:25 -0600 Subject: [PATCH] Yank import from last --- ...xpose-WorldBorder-isInBounds-Location-method.patch | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Spigot-Server-Patches/Expose-WorldBorder-isInBounds-Location-method.patch b/Spigot-Server-Patches/Expose-WorldBorder-isInBounds-Location-method.patch index e477cb6b7e..410da61fb1 100644 --- a/Spigot-Server-Patches/Expose-WorldBorder-isInBounds-Location-method.patch +++ b/Spigot-Server-Patches/Expose-WorldBorder-isInBounds-Location-method.patch @@ -5,16 +5,9 @@ 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 -@@ -0,0 +0,0 @@ - package org.bukkit.craftbukkit; - -+import net.minecraft.server.BlockPosition; - import org.bukkit.Location; - import org.bukkit.World; - import org.bukkit.WorldBorder; @@ -0,0 +0,0 @@ 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 }