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

Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-03-16 08:35:56 +11:00
parent 8b867225be
commit f831bcfce2
29 changed files with 323 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch
View File

@@ -1,4 +1,4 @@
From a21753931b6180bc32da505ed261fce5ea0461c9 Mon Sep 17 00:00:00 2001
From 8379b6c5ada2d27070c6dc223accf351f190a3a6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 25 Jan 2013 18:24:54 +1100
Subject: [PATCH] Better + more flexible itemstack merging
@@ -9,7 +9,7 @@ Subject: [PATCH] Better + more flexible itemstack merging
2 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index a7baa0f..5e3ac84 100644
index aa8d83f..bc69f5d 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -114,7 +114,8 @@ public class EntityItem extends Entity {
@@ -40,10 +40,10 @@ index a7baa0f..5e3ac84 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ec1a08f..2fe9b1d 100644
index d1be7c3..5cf6bc6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -924,31 +924,8 @@ public abstract class World implements IBlockAccess {
@@ -948,31 +948,8 @@ public abstract class World implements IBlockAccess {
event = CraftEventFactory.callCreatureSpawnEvent((EntityLiving) entity, spawnReason);
} else if (entity instanceof EntityItem) {
event = CraftEventFactory.callItemSpawnEvent((EntityItem) entity);
@@ -77,7 +77,7 @@ index ec1a08f..2fe9b1d 100644
EntityExperienceOrb xp = (EntityExperienceOrb) entity;
double radius = this.getWorld().expMergeRadius;
if (radius > 0) {
@@ -963,8 +940,8 @@ public abstract class World implements IBlockAccess {
@@ -987,8 +964,8 @@ public abstract class World implements IBlockAccess {
}
}
}
@@ -89,5 +89,5 @@ index ec1a08f..2fe9b1d 100644
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}
--
1.8.1.1
1.8.1-rc2