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

Don't skip item ticks

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-05-04 10:14:25 +10:00
parent c60ca2aa0f
commit 0faa468caa
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From e5030bb8e88d57428375af160227ad56bde7b2f3 Mon Sep 17 00:00:00 2001
From 5399bd4fdda73b55589eb48f69ee46ff3363c10d 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 e7481dd..9f1a7b7 100644
index 0225f53..294ab8f 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -116,7 +116,10 @@ public class EntityItem extends Entity {
@@ -114,7 +114,10 @@ public class EntityItem extends Entity {
}
private void g() {
@@ -21,7 +21,7 @@ index e7481dd..9f1a7b7 100644
while (iterator.hasNext()) {
EntityItem entityitem = (EntityItem) iterator.next();
@@ -145,11 +148,13 @@ public class EntityItem extends Entity {
@@ -143,11 +146,13 @@ public class EntityItem extends Entity {
} else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
return false;
} else {
@@ -41,7 +41,7 @@ index e7481dd..9f1a7b7 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a77f48d..f5730d3 100644
index 70dd295..b339688 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -949,6 +949,23 @@ public abstract class World implements IBlockAccess {
@@ -69,7 +69,7 @@ index a77f48d..f5730d3 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9da842e..a303090 100644
index 63e8e69..68fd274 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -92,6 +92,8 @@ public class CraftWorld implements World {