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

Remove a fair chunk of existing patches now applied to CraftBukkit

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-13 17:06:23 +10:00
parent a0c2b2a887
commit ece477d0c7
40 changed files with 116 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0004-Merge-tweaks-and-configuration.patch
View File

@@ -1,4 +1,4 @@
From 733da598baf9b69a7c1522582941ef45442566b8 Mon Sep 17 00:00:00 2001
From 02a200167495100ba6a4178eed5e586bb6ab33ac 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,10 +6,10 @@ 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 aa8d83f..6d54e97 100644
index e7481dd..9f1a7b7 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -114,7 +114,10 @@ public class EntityItem extends Entity {
@@ -116,7 +116,10 @@ public class EntityItem extends Entity {
}
private void g() {
@@ -21,7 +21,7 @@ index aa8d83f..6d54e97 100644
while (iterator.hasNext()) {
EntityItem entityitem = (EntityItem) iterator.next();
@@ -143,11 +146,13 @@ public class EntityItem extends Entity {
@@ -145,11 +148,13 @@ public class EntityItem extends Entity {
} else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
return false;
} else {
@@ -41,10 +41,10 @@ index aa8d83f..6d54e97 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0958209..3d77400 100644
index a77f48d..f5730d3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -950,6 +950,23 @@ public abstract class World implements IBlockAccess {
@@ -949,6 +949,23 @@ public abstract class World implements IBlockAccess {
// Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}