From ed0c46a55781af4b9c3178e94b40c7cb8c8b080d Mon Sep 17 00:00:00 2001 From: Brettflan Date: Tue, 29 Nov 2016 03:13:06 -0600 Subject: [PATCH] Fix for boat type being changed in Minecraft 1.9+ when knocked back from the border; note this breaks boat knockback for Minecraft versions older than 1.9 --- .../com/wimbli/WorldBorder/BorderCheckTask.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java index ae50e40..36d19b6 100644 --- a/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java +++ b/src/main/java/com/wimbli/WorldBorder/BorderCheckTask.java @@ -83,16 +83,9 @@ public class BorderCheckTask implements Runnable rideLoc.setY(newLoc.getY() + vertOffset); if (Config.Debug()) Config.logWarn("Player was riding a \"" + ride.toString() + "\"."); - if (ride instanceof Boat) - { // boats currently glitch on client when teleported, so crappy workaround is to remove it and spawn a new one - ride.remove(); - ride = world.spawnEntity(rideLoc, EntityType.BOAT); - } - else - { - ride.setVelocity(new Vector(0, 0, 0)); - ride.teleport(rideLoc, TeleportCause.PLUGIN); - } + + ride.setVelocity(new Vector(0, 0, 0)); + ride.teleport(rideLoc, TeleportCause.PLUGIN); if (Config.RemountTicks() > 0) {