Remove upstream pulled patch.

This commit is contained in:
md_5 2013-03-24 10:59:27 +11:00
parent 8fac398c63
commit 2314af8cb0
13 changed files with 16 additions and 42 deletions

View file

@ -1,4 +1,4 @@
From 8ddc8e32fae996aaff284a7bbe59e1c0d9f084ea Mon Sep 17 00:00:00 2001
From c9da444994984d83c474cc78ab7bfdbe043d7c32 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Sat, 2 Mar 2013 09:36:52 +1100
Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when

View file

@ -1,26 +0,0 @@
From 0caa529847ec93e28db06b1efc44bcd95024cae5 Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Thu, 21 Feb 2013 14:22:09 -0700
Subject: [PATCH] Identify outside slot independent of inventory type; Fixes
BUKKIT-2768
---
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index 6ffc73d..1c7934d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -75,7 +75,7 @@ public class CraftInventoryView extends InventoryView {
public static SlotType getSlotType(InventoryView inventory, int slot) {
SlotType type = SlotType.CONTAINER;
- if (slot < inventory.getTopInventory().getSize()) {
+ if (slot >= 0 && slot < inventory.getTopInventory().getSize()) {
switch(inventory.getType()) {
case FURNACE:
if (slot == 2) {
--
1.8.1-rc2

View file

@ -1,4 +1,4 @@
From adb39549b75e5e5e851484e05b4a8371a41ff517 Mon Sep 17 00:00:00 2001
From ae8970c74947203e8cabaa71b44ef06b8fce2d16 Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Mon, 25 Feb 2013 22:26:36 +0200
Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally

View file

@ -1,4 +1,4 @@
From 3e18c3f7430deb2f1d2961374c513fe7b1387ff9 Mon Sep 17 00:00:00 2001
From 1d944d45bd7b34fa8e4898a52e3faa4ec352ac8a Mon Sep 17 00:00:00 2001
From: Yariv Livay <yarivlivay@gmail.com>
Date: Tue, 26 Feb 2013 20:14:34 +0200
Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when

View file

@ -1,4 +1,4 @@
From c5c3bff96107ce30892a868fee8e1a01ece0a09a Mon Sep 17 00:00:00 2001
From d41afe438e9c798c4f7a71b4aee044fc1c4b22ee Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent

View file

@ -1,4 +1,4 @@
From 4314282ffb1d18eb45aa8a748a38b1c8fe41888c Mon Sep 17 00:00:00 2001
From 7139041a01222ac05965b666a600f65ddb8d9598 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities
@ -9,7 +9,7 @@ It is overkill to create a new SecureRandom on each entity create and then use i
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 24ab35f..c4c2595 100644
index 0538e20..150f5f8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -154,7 +154,7 @@ public abstract class Entity {

View file

@ -1,4 +1,4 @@
From d83fbc063ceb0c035c5a1007c9990f559b5641d6 Mon Sep 17 00:00:00 2001
From c175ccfef07273eda13c576a9a7f79e5eb945b01 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign

View file

@ -1,4 +1,4 @@
From 0e2aa35b6d74724a41072b50777fc92d716c64c7 Mon Sep 17 00:00:00 2001
From 940d1800403acd4b01d5d674d67ebf0bd6797906 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 21 Mar 2013 17:00:54 +1100
Subject: [PATCH] Stage DataWatcher & WatchableObject.

View file

@ -1,4 +1,4 @@
From 8f6d008a011275cf5205437a6f7a02680286a6e5 Mon Sep 17 00:00:00 2001
From 1f4574435a3791f1b922ff6b6a79b13a25795353 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges

View file

@ -1,4 +1,4 @@
From f081be9a6ac0b77c3776bfb3c058a65db932e80f Mon Sep 17 00:00:00 2001
From 80ee5d4d880cbcf81dd8c988cce5ba09e9214882 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@ -53,7 +53,7 @@ index 3bfd29b..bce217e 100644
if (metrics == null) {
try {
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 9cfee2d..64f68a2 100644
index 35056d9..df8dfaa 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -35,6 +35,8 @@ settings:

View file

@ -1,4 +1,4 @@
From 4a8f60ad4f5babc013cd49f510bea117f9356cc3 Mon Sep 17 00:00:00 2001
From b2a141a19dbaeee632b24975df66523116d0fe8b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:04:45 +1100
Subject: [PATCH] Texture Pack Resolutions
@ -45,7 +45,7 @@ index bce217e..8fd635f 100644
if (metrics == null) {
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3c34a4c..8361614 100644
index a7abd6e..56cdfb7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -828,7 +828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -58,7 +58,7 @@ index 3c34a4c..8361614 100644
getHandle().playerConnection.sendPacket(new Packet250CustomPayload("MC|TPack", message));
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 64f68a2..4034c6f 100644
index df8dfaa..bc0b044 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -37,6 +37,7 @@ settings:

View file

@ -1,4 +1,4 @@
From 1f2c584ebbd256e9e1842da982aa48ad0ab98b80 Mon Sep 17 00:00:00 2001
From 98830ca8c740c06391a4c4a0d08044299d244d2c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 13:31:23 +1100
Subject: [PATCH] Entity Tracking Intervals

View file

@ -1,4 +1,4 @@
From 385fdb39fa4e899ba325c9d525204814ea36cc5f Mon Sep 17 00:00:00 2001
From eab583f5316f3d7e32c74c9f613139e82dad849c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 19:08:41 +1100
Subject: [PATCH] Limit Custom Map Rendering