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

[Cosmetic] Update patches to be generated with latest stable git.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-10 12:36:11 +10:00
parent c35e70ad7d
commit b8055fe033
45 changed files with 337 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
View File

@@ -1,14 +1,14 @@
From 02388be2d963563eea16a68a5583f03908f17704 Mon Sep 17 00:00:00 2001
From 7cdbe04118599b614a616171d51f4dee54ffd0e5 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
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.
---
src/main/java/net/minecraft/server/EntityItem.java | 17 +++++++++++------
src/main/java/net/minecraft/server/World.java | 17 +++++++++++++++++
.../java/org/bukkit/craftbukkit/CraftWorld.java | 6 ++++++
src/main/resources/configurations/bukkit.yml | 2 ++
src/main/java/net/minecraft/server/EntityItem.java | 17 +++++++++++------
src/main/java/net/minecraft/server/World.java | 17 +++++++++++++++++
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 6 ++++++
src/main/resources/configurations/bukkit.yml | 2 ++
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
@@ -47,7 +47,7 @@ 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 cddc890..78e52d4 100644
index 0958209..3d77400 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 {
@@ -119,5 +119,5 @@ index bc00ad4..524c0ca 100644
cactus-growth-modifier: 100
melon-growth-modifier: 100
--
1.7.0.4
1.8.2.1