From 335c9c3009113520e9beadc38d0ab3564103f104 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Thu, 29 Jan 2015 15:26:20 -0600 Subject: [PATCH] Remove the broken teleport passenger vehicle with player patch --- .../Ability-to-disable-asynccatcher.patch | 4 +- .../Add-TNT-source-location-API.patch | 4 +- ...ructor-for-setting-header-and-footer.patch | 4 +- .../Add-async-chunk-load-API.patch | 4 +- ...-despawn-distances-for-living-entiti.patch | 4 +- .../Allow-for-toggling-of-spawn-chunks.patch | 4 +- .../Allow-nerfed-mobs-to-jump.patch | 4 +- ...ItemStacks-to-retain-their-invalid-d.patch | 4 +- .../Center-TNT-grid-sample-points.patch | 4 +- .../Configurable-TNT-water-movement.patch | 4 +- ...figurable-baby-zombie-movement-speed.patch | 4 +- ...ctus-and-reed-natural-growth-heights.patch | 4 +- ...e-damage-multiplier-for-PvP-blocking.patch | 4 +- .../Configurable-fishing-time-ranges.patch | 4 +- .../Configurable-game-mechanics-changes.patch | 4 +- ...le-speed-for-water-flowing-over-lava.patch | 4 +- .../Configurable-squid-spawn-ranges.patch | 4 +- ...rength-and-weakness-effect-modifiers.patch | 4 +- ...Do-not-remove-player-in-world-change.patch | 4 +- ...ck-entities-that-are-above-the-speci.patch | 4 +- .../Fix-directional-TNT-bias.patch | 4 +- .../Fix-redstone-lag-issues.patch | 4 +- .../Further-improve-server-tick-loop.patch | 4 +- ...-handling-out-of-the-chest-tick-loop.patch | 4 +- .../Only-refresh-abilities-if-needed.patch | 4 +- .../Optimize-TileEntity-Ticking.patch | 4 +- .../Player-Exhaustion-Multipliers.patch | 4 +- .../Player-affects-spawning-API.patch | 4 +- .../Player-lookup-improvements.patch | 4 +- ...it-Feature-of-ItemStack-s-having-inf.patch | 4 +- ...ve-invalid-mob-spawner-tile-entities.patch | 4 +- ...entities-that-fly-through-an-unloade.patch | 4 +- ...-in-client-crashes-server-lists-and-.patch | 4 +- ...leport-passenger-vehicle-with-player.patch | 96 ------------------- .../Temporary-fix-for-rails-dupe.patch | 4 +- .../Toggle-for-player-interact-limiter.patch | 4 +- .../Vanished-players-don-t-have-rights.patch | 4 +- 37 files changed, 108 insertions(+), 132 deletions(-) delete mode 100644 Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch diff --git a/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch b/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch index 917326fd8..6ebf18917 100644 --- a/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch +++ b/Spigot-Server-Patches/Ability-to-disable-asynccatcher.patch @@ -35,4 +35,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public static void catchOp(String reason) { --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Add-TNT-source-location-API.patch b/Spigot-Server-Patches/Add-TNT-source-location-API.patch index 22dc5a45f..815a504ca 100644 --- a/Spigot-Server-Patches/Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/Add-TNT-source-location-API.patch @@ -127,4 +127,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // PaperSpigot end } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Add-a-constructor-for-setting-header-and-footer.patch b/Spigot-Server-Patches/Add-a-constructor-for-setting-header-and-footer.patch index fb148bb72..bc83fc751 100644 --- a/Spigot-Server-Patches/Add-a-constructor-for-setting-header-and-footer.patch +++ b/Spigot-Server-Patches/Add-a-constructor-for-setting-header-and-footer.patch @@ -22,4 +22,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void a(PacketListenerPlayOut packetlistenerplayout) { packetlistenerplayout.a(this); } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Add-async-chunk-load-API.patch b/Spigot-Server-Patches/Add-async-chunk-load-API.patch index 135722692..762afd0db 100644 --- a/Spigot-Server-Patches/Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/Add-async-chunk-load-API.patch @@ -33,4 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public Chunk getChunkAt(int x, int z) { return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk; } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch index 5ddf90da9..b76621166 100644 --- a/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch @@ -60,4 +60,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + hardDespawnDistance = hardDespawnDistance*hardDespawnDistance; + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch index 183cb450e..85463139e 100644 --- a/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/Allow-for-toggling-of-spawn-chunks.patch @@ -32,4 +32,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Keep spawn chunk loaded: " + keepSpawnInMemory ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch index 33ad4c862..460e7e2f3 100644 --- a/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch @@ -21,4 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return; } // Spigot End --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 381ada0d9..a005148f6 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,4 +63,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Bukkit.getLogger().info( "Data value allowed items: " + StringUtils.join(dataValueAllowedItems, ", ") ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/Center-TNT-grid-sample-points.patch index 7496e3170..b4e21bb89 100644 --- a/Spigot-Server-Patches/Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/Center-TNT-grid-sample-points.patch @@ -30,4 +30,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ++i; } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-TNT-water-movement.patch b/Spigot-Server-Patches/Configurable-TNT-water-movement.patch index 4007b2d0b..e60a265fe 100644 --- a/Spigot-Server-Patches/Configurable-TNT-water-movement.patch +++ b/Spigot-Server-Patches/Configurable-TNT-water-movement.patch @@ -36,4 +36,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + tntMovesInWater = getBoolean("tnt-moves-in-water", true ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/Configurable-baby-zombie-movement-speed.patch index f58f99571..05ab64f63 100644 --- a/Spigot-Server-Patches/Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/Configurable-baby-zombie-movement-speed.patch @@ -33,4 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch index 126d2c82a..c50b1fc27 100644 --- a/Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch @@ -48,4 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-damage-multiplier-for-PvP-blocking.patch b/Spigot-Server-Patches/Configurable-damage-multiplier-for-PvP-blocking.patch index 7be8016da..974dae45d 100644 --- a/Spigot-Server-Patches/Configurable-damage-multiplier-for-PvP-blocking.patch +++ b/Spigot-Server-Patches/Configurable-damage-multiplier-for-PvP-blocking.patch @@ -33,4 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch index 8c23390db..56590980e 100644 --- a/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch @@ -35,4 +35,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch index d159f424e..45f619a93 100644 --- a/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch +++ b/Spigot-Server-Patches/Configurable-game-mechanics-changes.patch @@ -77,4 +77,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 437acd588..bdae7508d 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 @@ -58,4 +58,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Water over lava flow speed: " + waterOverLavaFlowSpeed ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/Configurable-squid-spawn-ranges.patch index 63986882f..f80000aa8 100644 --- a/Spigot-Server-Patches/Configurable-squid-spawn-ranges.patch +++ b/Spigot-Server-Patches/Configurable-squid-spawn-ranges.patch @@ -36,4 +36,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Configurable-strength-and-weakness-effect-modifiers.patch b/Spigot-Server-Patches/Configurable-strength-and-weakness-effect-modifiers.patch index 41e155b56..2cfa62cb4 100644 --- a/Spigot-Server-Patches/Configurable-strength-and-weakness-effect-modifiers.patch +++ b/Spigot-Server-Patches/Configurable-strength-and-weakness-effect-modifiers.patch @@ -34,4 +34,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + weaknessEffectModifier = getDouble( "effect-modifiers.weakness", -0.5D ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch index 7ca843f22..92109874d 100644 --- a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch +++ b/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch @@ -26,4 +26,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.f.put(entityplayer1.getUniqueID(), entityplayer1); } // Added from changeDimension --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 00d1809e9..3e228be9e 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 @@ -46,4 +46,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Fix-directional-TNT-bias.patch b/Spigot-Server-Patches/Fix-directional-TNT-bias.patch index b78451882..1b0d8544a 100644 --- a/Spigot-Server-Patches/Fix-directional-TNT-bias.patch +++ b/Spigot-Server-Patches/Fix-directional-TNT-bias.patch @@ -23,4 +23,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.fuseTicks = 80; this.lastX = d0; this.lastY = d1; --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/Fix-redstone-lag-issues.patch index 3a520b5ca..aaf16f858 100644 --- a/Spigot-Server-Patches/Fix-redstone-lag-issues.patch +++ b/Spigot-Server-Patches/Fix-redstone-lag-issues.patch @@ -30,4 +30,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.methodProfiler.a("cleaning"); --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch index dc52a2723..c01459a03 100644 --- a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch @@ -211,4 +211,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 { return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Move-sound-handling-out-of-the-chest-tick-loop.patch b/Spigot-Server-Patches/Move-sound-handling-out-of-the-chest-tick-loop.patch index e7d17e2a7..f54054aae 100644 --- a/Spigot-Server-Patches/Move-sound-handling-out-of-the-chest-tick-loop.patch +++ b/Spigot-Server-Patches/Move-sound-handling-out-of-the-chest-tick-loop.patch @@ -197,4 +197,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.world.playBlockAction(this.position, Blocks.ENDER_CHEST, 1, this.g); } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch index f9a19daca..0a89c3547 100644 --- a/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/Only-refresh-abilities-if-needed.patch @@ -23,4 +23,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } @Override --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch index f21b437a8..e79c79f4c 100644 --- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch @@ -283,4 +283,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } +} \ No newline at end of file --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/Player-Exhaustion-Multipliers.patch index 3b2feb9b7..479a915a0 100644 --- a/Spigot-Server-Patches/Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/Player-Exhaustion-Multipliers.patch @@ -54,4 +54,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + playerSwimmingExhaustion = getFloat("player-exhaustion.swimming", 0.015F ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch index 4b630c042..354002064 100644 --- a/Spigot-Server-Patches/Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch @@ -166,4 +166,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 }; public Player.Spigot spigot() --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Player-lookup-improvements.patch b/Spigot-Server-Patches/Player-lookup-improvements.patch index 061b478ed..a556b8d4e 100644 --- a/Spigot-Server-Patches/Player-lookup-improvements.patch +++ b/Spigot-Server-Patches/Player-lookup-improvements.patch @@ -170,4 +170,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public InetSocketAddress getAddress() { --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch b/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch index 21f5d3b34..0f9847a18 100644 --- a/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch +++ b/Spigot-Server-Patches/Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch @@ -149,4 +149,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (itemstack != null && itemstack.count > this.getMaxStackSize()) { itemstack.count = this.getMaxStackSize(); } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 ae493c9d0..ea9f4bf47 100644 --- a/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/Remove-invalid-mob-spawner-tile-entities.patch @@ -36,4 +36,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch index b2666054f..9ebc6eab7 100644 --- a/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch @@ -115,4 +115,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true ); + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 40aa69c88..92c6dcbc9 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,4 +18,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public CrashReport b(CrashReport crashreport) { --- \ No newline at end of file +-- +1.9.5.msysgit.0 + 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 66ae99d4c..000000000 --- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 28 Nov 2014 00:24:18 -0600 -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 { - return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; - } - // 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; -@@ -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 - 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 - 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 -+ entity.mount(null); // Comment out when fully working, until then leave this -+ -+ 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 -+ if (vehicle != null) { -+ vehicle.retrack(); -+ } -+ -+ if (passenger != null) { -+ passenger.retrack(); -+ } -+ // PaperSpigot end -+ - return true; - } - --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch b/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch index 96392b5d3..297580708 100644 --- a/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch +++ b/Spigot-Server-Patches/Temporary-fix-for-rails-dupe.patch @@ -23,4 +23,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } else { this.b(world, blockposition, iblockdata, block); } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch index bf11ed59b..d693179a3 100644 --- a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch @@ -36,4 +36,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } } --- \ No newline at end of file +-- +1.9.5.msysgit.0 + diff --git a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch index 8bb821509..84723cdfc 100644 --- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch @@ -74,4 +74,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!entity1.dead && entity1.k && entity1 != entity && (entity == null || entity.vehicle != entity1 && entity.passenger != entity1)) { return false; } --- \ No newline at end of file +-- +1.9.5.msysgit.0 +