From fbf4580cd24c964938d519a807965f26658312ea Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Sat, 23 Mar 2013 23:37:23 +0500 Subject: [PATCH] Remove patch for upstream merge --- ...rt.patch => 0041-BungeeCord-Support.patch} | 0 .../0041-Fixed-Bukkit-3831.patch | 25 ------------------- ...ch => 0042-Texture-Pack-Resolutions.patch} | 0 ...h => 0043-Entity-Tracking-Intervals.patch} | 0 ... => 0044-Limit-Custom-Map-Rendering.patch} | 0 5 files changed, 25 deletions(-) rename CraftBukkit-Patches/{0042-BungeeCord-Support.patch => 0041-BungeeCord-Support.patch} (100%) delete mode 100644 CraftBukkit-Patches/0041-Fixed-Bukkit-3831.patch rename CraftBukkit-Patches/{0043-Texture-Pack-Resolutions.patch => 0042-Texture-Pack-Resolutions.patch} (100%) rename CraftBukkit-Patches/{0044-Entity-Tracking-Intervals.patch => 0043-Entity-Tracking-Intervals.patch} (100%) rename CraftBukkit-Patches/{0045-Limit-Custom-Map-Rendering.patch => 0044-Limit-Custom-Map-Rendering.patch} (100%) diff --git a/CraftBukkit-Patches/0042-BungeeCord-Support.patch b/CraftBukkit-Patches/0041-BungeeCord-Support.patch similarity index 100% rename from CraftBukkit-Patches/0042-BungeeCord-Support.patch rename to CraftBukkit-Patches/0041-BungeeCord-Support.patch diff --git a/CraftBukkit-Patches/0041-Fixed-Bukkit-3831.patch b/CraftBukkit-Patches/0041-Fixed-Bukkit-3831.patch deleted file mode 100644 index 5da8ebd63..000000000 --- a/CraftBukkit-Patches/0041-Fixed-Bukkit-3831.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fc928096a3a6cf59ed11cd84f1368e1640c53125 Mon Sep 17 00:00:00 2001 -From: me4502 -Date: Fri, 22 Mar 2013 19:13:32 +1000 -Subject: [PATCH] Fixed Bukkit-3831 - ---- - src/main/java/net/minecraft/server/Entity.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c4c2595..35fd279 100644 ---- a/src/main/java/net/minecraft/server/Entity.java -+++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1449,7 +1449,7 @@ public abstract class Entity { - this.vehicle = null; - } else { - // CraftBukkit start -- if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) { -+ if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle) && entity.world.isChunkLoaded((int)entity.locX >> 4, (int)entity.locZ >> 4)) { - VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity); - pluginManager.callEvent(event); - --- -1.8.1-rc2 - diff --git a/CraftBukkit-Patches/0043-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0042-Texture-Pack-Resolutions.patch similarity index 100% rename from CraftBukkit-Patches/0043-Texture-Pack-Resolutions.patch rename to CraftBukkit-Patches/0042-Texture-Pack-Resolutions.patch diff --git a/CraftBukkit-Patches/0044-Entity-Tracking-Intervals.patch b/CraftBukkit-Patches/0043-Entity-Tracking-Intervals.patch similarity index 100% rename from CraftBukkit-Patches/0044-Entity-Tracking-Intervals.patch rename to CraftBukkit-Patches/0043-Entity-Tracking-Intervals.patch diff --git a/CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch b/CraftBukkit-Patches/0044-Limit-Custom-Map-Rendering.patch similarity index 100% rename from CraftBukkit-Patches/0045-Limit-Custom-Map-Rendering.patch rename to CraftBukkit-Patches/0044-Limit-Custom-Map-Rendering.patch