From 603159dedf07d7ec680b9309f5e5bd1c74fb44d2 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 12 Sep 2015 19:57:39 -0500 Subject: [PATCH] Remove several broken or unnecessary patches. Removes PlayerMicroMoveEvent API, the ability to disable the AsyncCatcher, and the TeleportPassengerVehicleWithPlayer patch --- .../Add-BeaconEffectEvent.patch | 4 +- .../Add-PlayerMicroMoveEvent.patch | 47 --------- .../Ability-to-disable-asynccatcher.patch | 39 -------- ...Add-FallingBlock-source-location-API.patch | 4 +- .../Add-PlayerLocaleChangeEvent.patch | 4 +- .../Add-async-chunk-load-API.patch | 4 +- .../Allow-nerfed-mobs-to-jump.patch | 4 +- ...ItemStacks-to-retain-their-invalid-d.patch | 4 +- .../Always-tick-falling-blocks.patch | 4 +- ...e-before-converting-and-renaming-pla.patch | 4 +- Spigot-Server-Patches/ChunkMap-caching.patch | 4 +- ...ble-end-credits-when-leaving-the-end.patch | 4 +- .../Configurable-game-mechanics-changes.patch | 4 +- .../Configurable-lava-flow-speed.patch | 4 +- .../Configurable-mob-spawner-tick-rate.patch | 6 +- ...le-speed-for-water-flowing-over-lava.patch | 4 +- .../Disable-ice-and-snow.patch | 4 +- .../Disable-mood-sounds.patch | 2 +- Spigot-Server-Patches/Disable-thunder.patch | 4 +- ...ck-entities-that-are-above-the-speci.patch | 4 +- ...e-block-they-re-holding-when-they-di.patch | 4 +- Spigot-Server-Patches/Fast-draining.patch | 4 +- .../Fix-jar-being-shaded-multiple-times.patch | 4 +- ...-explosions-processing-dead-entities.patch | 4 +- .../Fix-redstone-lag-issues.patch | 4 +- .../Only-refresh-abilities-if-needed.patch | 4 +- .../Optimize-Spigot-s-Anti-X-Ray.patch | 4 +- .../Optimize-TileEntity-Ticking.patch | 4 +- Spigot-Server-Patches/Optimize-draining.patch | 4 +- .../Player-affects-spawning-API.patch | 4 +- ...event-tile-entity-and-entity-crashes.patch | 4 +- ...ve-invalid-mob-spawner-tile-entities.patch | 4 +- ...sition-the-first-time-an-entity-is-s.patch | 4 +- ...-in-client-crashes-server-lists-and-.patch | 4 +- ...lowing-block-if-material-has-changed.patch | 4 +- ...leport-passenger-vehicle-with-player.patch | 99 ------------------- .../Toggle-for-player-interact-limiter.patch | 4 +- ...r-crits-helps-mitigate-hacked-client.patch | 4 +- 38 files changed, 37 insertions(+), 288 deletions(-) delete mode 100644 Spigot-API-Patches/Add-PlayerMicroMoveEvent.patch delete mode 100644 Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch delete mode 100644 Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch diff --git a/Spigot-API-Patches/Add-BeaconEffectEvent.patch b/Spigot-API-Patches/Add-BeaconEffectEvent.patch index 6c96302217..006b800765 100644 --- a/Spigot-API-Patches/Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/Add-BeaconEffectEvent.patch @@ -91,6 +91,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return handlers; + } +} --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-API-Patches/Add-PlayerMicroMoveEvent.patch b/Spigot-API-Patches/Add-PlayerMicroMoveEvent.patch deleted file mode 100644 index 10aae28e93..0000000000 --- a/Spigot-API-Patches/Add-PlayerMicroMoveEvent.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Techcable -Date: Thu, 23 Jul 2015 03:19:57 -0700 -Subject: [PATCH] Add PlayerMicroMoveEvent - - -diff --git a/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java b/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java -new file mode 100644 -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 ---- /dev/null -+++ b/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java -@@ -0,0 +0,0 @@ -+package org.github.paperspigot.event.player; -+ -+import org.bukkit.Location; -+import org.bukkit.entity.Player; -+import org.bukkit.event.HandlerList; -+import org.bukkit.event.player.PlayerMoveEvent; -+ -+/** -+ * This event is fired for player movements that are too small to track with PlayerMoveEvent. -+ * -+ * When used in combination with PlayerMoveEvent, it is possible to keep track of all -+ * PacketPlayInFlying movements. This can be particularly useful for anti-cheat plugins. -+ * -+ * Please note this event is not intended for casual use. Plugins that casually use this event -+ * may cause significant overhead depending on handler logic. -+ */ -+public class PlayerMicroMoveEvent extends PlayerMoveEvent { -+ private static final HandlerList handlerList = new HandlerList(); -+ -+ public PlayerMicroMoveEvent(Player player, Location from, Location to) { -+ super(player, from, to); -+ } -+ -+ @Override -+ public HandlerList getHandlers() { -+ return getHandlerList(); -+ } -+ -+ public static HandlerList getHandlerList() { -+ return handlerList; -+ } -+} --- -1.9.5.msysgit.1 - diff --git a/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch b/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch deleted file mode 100644 index ff1cdd1bff..0000000000 --- a/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown <1254957+zachbr@users.noreply.github.com> -Date: Sat, 7 Mar 2015 20:46:54 -0600 -Subject: [PATCH] Ability to disable asynccatcher - - -diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -@@ -0,0 +0,0 @@ public class PaperSpigotConfig - { - babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D ); // Player moves at 0.1F, for reference - } -+ -+ public static boolean asyncCatcherFeature; -+ private static void asyncCatcherFeature() -+ { -+ asyncCatcherFeature = getBoolean( "settings.async-plugin-bad-magic-catcher", true ); -+ if ( !asyncCatcherFeature ) -+ { -+ Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" ); -+ } -+ } - } -diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/spigotmc/AsyncCatcher.java -+++ b/src/main/java/org/spigotmc/AsyncCatcher.java -@@ -0,0 +0,0 @@ import net.minecraft.server.MinecraftServer; - public class AsyncCatcher - { - -- public static boolean enabled = true; -+ public static boolean enabled = org.github.paperspigot.PaperSpigotConfig.asyncCatcherFeature; // PaperSpigot - Allow disabling of AsyncCatcher from PaperSpigotConfig - - public static void catchOp(String reason) - { --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch index 4e4afacce7..ab5056730e 100644 --- a/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch +++ b/Spigot-Server-Patches/Add-FallingBlock-source-location-API.patch @@ -140,6 +140,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // PaperSpigot end } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch index affe6502db..3409ac5cf6 100644 --- a/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/Add-PlayerLocaleChangeEvent.patch @@ -40,6 +40,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // PaperSpigot end } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-async-chunk-load-API.patch b/Spigot-Server-Patches/Add-async-chunk-load-API.patch index 0ae474ae27..1357226929 100644 --- a/Spigot-Server-Patches/Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/Add-async-chunk-load-API.patch @@ -33,6 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public Chunk getChunkAt(int x, int z) { return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk; } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch index c6584807a7..1b23ffa787 100644 --- a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch @@ -41,6 +41,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.a(4); ((Navigation) entityinsentient.getNavigation()).d(true); } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index b98d126fca..381ada0d92 100644 --- a/Spigot-Server-Patches/Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -63,6 +63,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Bukkit.getLogger().info( "Data value allowed items: " + StringUtils.join(dataValueAllowedItems, ", ") ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Always-tick-falling-blocks.patch b/Spigot-Server-Patches/Always-tick-falling-blocks.patch index c2d2eeba8d..985c36df69 100644 --- a/Spigot-Server-Patches/Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/Always-tick-falling-blocks.patch @@ -24,6 +24,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 || entity instanceof EntityEnderCrystal || entity instanceof EntityFireworks ) { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/Check-online-mode-before-converting-and-renaming-pla.patch index fba7eaa658..13f05be0d2 100644 --- a/Spigot-Server-Patches/Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/Check-online-mode-before-converting-and-renaming-pla.patch @@ -17,6 +17,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 { file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/ChunkMap-caching.patch b/Spigot-Server-Patches/ChunkMap-caching.patch index 56737cd3e2..220cc9ac03 100644 --- a/Spigot-Server-Patches/ChunkMap-caching.patch +++ b/Spigot-Server-Patches/ChunkMap-caching.patch @@ -135,6 +135,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + cacheChunkMaps = getBoolean( "cache-chunk-maps", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch index 35af935638..64c2cdd9fc 100644 --- a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch +++ b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch @@ -88,6 +88,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch index c9d9250268..51dfa6d50b 100644 --- a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch +++ b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch @@ -77,6 +77,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/Configurable-lava-flow-speed.patch index 579ba0be06..f27d13b422 100644 --- a/Spigot-Server-Patches/Configurable-lava-flow-speed.patch +++ b/Spigot-Server-Patches/Configurable-lava-flow-speed.patch @@ -35,6 +35,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + lavaFlowSpeedNether = getInt( "lava-flow-speed.nether", 10 ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch index 68c852c9a9..4a442fcf7f 100644 --- a/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch @@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 8e5de323..12697ff 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig @@ -64,6 +64,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + mobSpawnerTickRate = getInt( "mob-spawner-tick-rate", 1 ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch index f7e8b451fe..66d97ed0ff 100644 --- a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch @@ -57,6 +57,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Water over lava flow speed: " + waterOverLavaFlowSpeed ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Disable-ice-and-snow.patch b/Spigot-Server-Patches/Disable-ice-and-snow.patch index 631fedc809..b1dc69e404 100644 --- a/Spigot-Server-Patches/Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/Disable-ice-and-snow.patch @@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + disableIceAndSnow = getBoolean( "disable-ice-and-snow", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Disable-mood-sounds.patch b/Spigot-Server-Patches/Disable-mood-sounds.patch index 22f2c7286d..b6119630c3 100644 --- a/Spigot-Server-Patches/Disable-mood-sounds.patch +++ b/Spigot-Server-Patches/Disable-mood-sounds.patch @@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 int k = this.m >> 2; int l = k & 15; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000003 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig diff --git a/Spigot-Server-Patches/Disable-thunder.patch b/Spigot-Server-Patches/Disable-thunder.patch index 4d0bff893a..3f2382953d 100644 --- a/Spigot-Server-Patches/Disable-thunder.patch +++ b/Spigot-Server-Patches/Disable-thunder.patch @@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + disableThunder = getBoolean( "disable-thunder", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch index 44a2aeb5f5..67bf87f927 100644 --- a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch @@ -88,6 +88,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Enderman-drop-the-block-they-re-holding-when-they-di.patch b/Spigot-Server-Patches/Enderman-drop-the-block-they-re-holding-when-they-di.patch index 4269beeaa3..f3e243baba 100644 --- a/Spigot-Server-Patches/Enderman-drop-the-block-they-re-holding-when-they-di.patch +++ b/Spigot-Server-Patches/Enderman-drop-the-block-they-re-holding-when-they-di.patch @@ -22,6 +22,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public void setCarried(IBlockData iblockdata) { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fast-draining.patch b/Spigot-Server-Patches/Fast-draining.patch index 640fa5e84d..df974912f4 100644 --- a/Spigot-Server-Patches/Fast-draining.patch +++ b/Spigot-Server-Patches/Fast-draining.patch @@ -96,6 +96,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + fastDrainWater = getBoolean( "fast-drain.water", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch b/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch index 9b77fda0b8..b9e147197a 100644 --- a/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch +++ b/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch @@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 org.bukkit.craftbukkit.Main --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch index 3f2e2f1737..538f200dd2 100644 --- a/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch @@ -24,6 +24,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ); for (int l1 = 0; l1 < list.size(); ++l1) { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/Fix-redstone-lag-issues.patch index bd300f356b..5a76b1967f 100644 --- a/Spigot-Server-Patches/Fix-redstone-lag-issues.patch +++ b/Spigot-Server-Patches/Fix-redstone-lag-issues.patch @@ -72,6 +72,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch index 3468132629..f9a19daca8 100644 --- a/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch @@ -23,6 +23,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } @Override --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch b/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch index f0e4901ea7..e6d7d71a10 100644 --- a/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch +++ b/Spigot-Server-Patches/Optimize-Spigot-s-Anti-X-Ray.patch @@ -83,6 +83,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 update.startTiming(); updateNearbyBlocks( world, position, 2, false ); // 2 is the radius, we shouldn't change it as that would make it exponentially slower update.stopTiming(); --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch index e11d45a9fd..147a58b643 100644 --- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch @@ -261,6 +261,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } +} \ No newline at end of file --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Optimize-draining.patch b/Spigot-Server-Patches/Optimize-draining.patch index 3e3fd2ee6f..6e0ac70b46 100644 --- a/Spigot-Server-Patches/Optimize-draining.patch +++ b/Spigot-Server-Patches/Optimize-draining.patch @@ -24,6 +24,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } } else { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch index 4c9942f655..fb12448c50 100644 --- a/Spigot-Server-Patches/Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch @@ -197,6 +197,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 }; public Player.Spigot spigot() --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch index f5a10ac706..0c656539ef 100644 --- a/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch @@ -63,6 +63,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } // Spigot start finally { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch index adc151ef6d..0cb626088f 100644 --- a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch @@ -36,6 +36,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch index 418b847ce7..7759b9e79d 100644 --- a/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -83,6 +83,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.trackedPlayers.add(entityplayer); Packet packet = this.c(); --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index a274df2058..e758aedcbc 100644 --- a/Spigot-Server-Patches/Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -18,6 +18,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public CrashReport b(CrashReport crashreport) { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch index 8047cb64d5..9426171bf9 100644 --- a/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch +++ b/Spigot-Server-Patches/Stop-updating-flowing-block-if-material-has-changed.patch @@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 IBlockData iblockdata2 = world.getType(blockposition.down()); if (this.h(world, blockposition.down(), iblockdata2)) { --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch deleted file mode 100644 index 7acce93ac1..0000000000 --- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 31 May 2015 01:44:02 -0500 -Subject: [PATCH] Teleport passenger/vehicle with player - - -diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/Entity.java -+++ b/src/main/java/net/minecraft/server/Entity.java -@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { - } - // CraftBukikt end - -+ // PaperSpigot start - Teleport passenger/vehicle with player -+ public void retrack() { -+ final EntityTracker entityTracker = ((WorldServer) world).getTracker(); -+ entityTracker.untrackEntity(this); -+ entityTracker.track(this); -+ -+ } -+ // PaperSpigot end -+ - private static final AxisAlignedBB a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); - private static int entityCount; - private int id; -@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { - // minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1); - boolean before = worldserver1.chunkProviderServer.forceChunkLoad; - worldserver1.chunkProviderServer.forceChunkLoad = true; -- worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal); -+ //worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal); // PaperSpigot - Teleport passenger/vehicle with player, no... this entity is dead; - worldserver1.chunkProviderServer.forceChunkLoad = before; - // CraftBukkit end - this.world.methodProfiler.c("reloading"); -@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { - - if (entity != null) { - entity.n(this); -+ -+ // PaperSpigot start - Teleport passenger/vehicle with player, move entity to new location -+ exit.getBlock(); // force load -+ entity.setLocation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch()); -+ // PaperSpigot end -+ - /* CraftBukkit start - We need to do this... - if (j == 1 && i == 1) { - BlockPosition blockposition = this.world.r(worldserver1.getSpawn()); -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - } - - // If this player is riding another entity, we must dismount before teleporting. -- entity.mount(null); -+ // PaperSpigot start - Teleport passenger/vehicle with player -+ //entity.mount(null); -+ -+ Entity vehicle = entity.vehicle; -+ Entity passenger = entity.passenger; -+ if (vehicle != null) { -+ vehicle.passenger = null; -+ vehicle.teleportTo(location, false); -+ vehicle = vehicle.getBukkitEntity().getHandle(); -+ entity.vehicle = vehicle; -+ vehicle.passenger = entity; -+ } -+ -+ if (passenger != null) { -+ passenger.vehicle = null; -+ passenger.teleportTo(location, false); -+ passenger = passenger.getBukkitEntity().getHandle(); -+ entity.passenger = passenger; -+ passenger.vehicle = entity; -+ } -+ // PaperSpigot end - - // Update the From Location - from = event.getFrom(); -@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - } else { - server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true); - } -+ -+ // PaperSpigot start - Teleport passenger/vehicle with player -+ if (vehicle != null) { -+ vehicle.retrack(); -+ //entity.retrack(); -+ } -+ if (passenger != null) { -+ passenger.retrack(); -+ } -+ // PaperSpigot end - return true; - } - --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch index bb12f1c934..69053b68c7 100644 --- a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch @@ -23,8 +23,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -0,0 +0,0 @@ public class PaperSpigotConfig - Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" ); - } + { + babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D ); // Player moves at 0.1F, for reference } + + public static boolean interactLimitEnabled; diff --git a/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch index 243cd237b3..fab1b5c241 100644 --- a/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -33,6 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public boolean netherVoidTopDamage; --- -1.9.5.msysgit.1 - +-- \ No newline at end of file