From 5c14b02d79edff1e4524b1e4262815cc7a6c5c6c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 10 Dec 2013 09:36:25 +1100
Subject: [PATCH] Upstream merge

---
 Bukkit                                        |  2 +-
 CraftBukkit                                   |  2 +-
 ...046-Entity-Mount-and-Dismount-Events.patch |  8 +++----
 ...ng-servers-when-breaking-item-frames.patch | 22 -------------------
 4 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 CraftBukkit-Patches/0073-Fix-TNT-crashing-servers-when-breaking-item-frames.patch

diff --git a/Bukkit b/Bukkit
index c00ac0851..bd80c6eb2 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit c00ac08514c93edc88e556d40ac75a54eb40e271
+Subproject commit bd80c6eb2d0ad2f68e74097b70c8e6a362517253
diff --git a/CraftBukkit b/CraftBukkit
index 2220179b0..4857595e0 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2220179b086eb5fe1ad17bd959339b5cd1379af1
+Subproject commit 4857595e0afadd112f8ba147d88052b23b252797
diff --git a/CraftBukkit-Patches/0046-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0046-Entity-Mount-and-Dismount-Events.patch
index fc6af76b4..38fb2270e 100644
--- a/CraftBukkit-Patches/0046-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0046-Entity-Mount-and-Dismount-Events.patch
@@ -1,14 +1,14 @@
-From 53470d677dd3e38c6bebf68c9fc8484894c3ec07 Mon Sep 17 00:00:00 2001
+From 81e0c28d1d10bca5fe94f73c337ef54f700c4bc6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 621e6c2..3450502 100644
+index 6ccba9f..b18d34b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1452,6 +1452,7 @@ public abstract class Entity {
+@@ -1451,6 +1451,7 @@ public abstract class Entity {
                      }
                  }
                  // CraftBukkit end
@@ -16,7 +16,7 @@ index 621e6c2..3450502 100644
  
                  this.setPositionRotation(this.vehicle.locX, this.vehicle.boundingBox.b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
                  this.vehicle.passenger = null;
-@@ -1487,6 +1488,17 @@ public abstract class Entity {
+@@ -1486,6 +1487,17 @@ public abstract class Entity {
                  }
              }
              // CraftBukkit end
diff --git a/CraftBukkit-Patches/0073-Fix-TNT-crashing-servers-when-breaking-item-frames.patch b/CraftBukkit-Patches/0073-Fix-TNT-crashing-servers-when-breaking-item-frames.patch
deleted file mode 100644
index 75fdd09b3..000000000
--- a/CraftBukkit-Patches/0073-Fix-TNT-crashing-servers-when-breaking-item-frames.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0a5e2023327936a1a8cfacfa8dd75d7bd62e5b73 Mon Sep 17 00:00:00 2001
-From: TheUnnamedDude <kevin.sillerud@gmail.com>
-Date: Mon, 9 Dec 2013 11:31:54 +0000
-Subject: [PATCH] Fix TNT crashing servers when breaking item frames
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 059a1e8..bb7110b 100644
---- a/src/main/java/net/minecraft/server/EntityItemFrame.java
-+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
-@@ -24,7 +24,7 @@ public class EntityItemFrame extends EntityHanging {
-         } else if (this.getItem() != null) {
-             if (!this.world.isStatic) {
-                 // CraftBukkit start
--                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f).isCancelled() || this.dead) {
-+                if (damagesource.getEntity() != null && (org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f).isCancelled() || this.dead)) {
-                     return false;
-                 }
-                 // CraftBukkit end
--- 
-1.8.4.msysgit.0
-