SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest CraftBukkit and refresh all patch hashes - somehow InventoryClickEvent patch got applied twice.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-11 11:31:30 +10:00
parent 9b3ea87959
commit 51c9200b04
83 changed files with 117 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
View File

@@ -1,4 +1,4 @@
From dcf697293680dd7593a8e1f92ac65b36c7be48db Mon Sep 17 00:00:00 2001
From add74cc2f0f32f3fc3199fcc3b8054ffef974ad2 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index cb2b114..6895b53 100644
index 8e1b024..0b8756b 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -112,7 +112,10 @@ public class EntityItem extends Entity {
@@ -41,7 +41,7 @@ index cb2b114..6895b53 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 18994b6..3e7c493 100644
index 8ac0e8e..0968ed8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -956,6 +956,23 @@ public abstract class World implements IBlockAccess {