diff --git a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch index be3ea58f3c..82056ebf84 100644 --- a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch @@ -61,6 +61,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-PlayerMicroMoveEvent.patch b/Spigot-Server-Patches/Add-PlayerMicroMoveEvent.patch deleted file mode 100644 index 99b9f602b0..0000000000 --- a/Spigot-Server-Patches/Add-PlayerMicroMoveEvent.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Techcable -Date: Thu, 23 Jul 2015 04:29:22 -0700 -Subject: [PATCH] Add PlayerMicroMoveEvent - - -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/PlayerConnection.java -+++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -0,0 +0,0 @@ import org.bukkit.util.NumberConversions; - // CraftBukkit end - - import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot -+import org.github.paperspigot.event.player.PlayerMicroMoveEvent; // PaperSpigot - - public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerListBox { - -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList - double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2); - float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch()); - -- if ((delta > 1f / 256 || deltaAngle > 10f) && (this.checkMovement && !this.player.dead)) { -+ if ((delta > 0 || deltaAngle > 0) && (this.checkMovement && !this.player.dead)) { // PaperSpigot - this.lastPosX = to.getX(); - this.lastPosY = to.getY(); - this.lastPosZ = to.getZ(); -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList - // Skip the first time we do this - if (true) { // Spigot - don't skip any move events - Location oldTo = to.clone(); -- PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); -+ PlayerMoveEvent event = (delta > 1f / 256 || deltaAngle > 10f) ? new PlayerMoveEvent(player, from, to) : new PlayerMicroMoveEvent(player, from, to); // PaperSpigot - PlayerMicroMoveEvent - this.server.getPluginManager().callEvent(event); - - // If the event is cancelled we move the player back to their old location. --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch index bb5fc37dae..919d7ddea9 100644 --- a/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/Configurable-container-update-tick-rate.patch @@ -47,6 +47,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + containerUpdateTickRate = getInt("container-update-tick-rate", 1); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file