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

Fix lightning - use vanilla lightning code.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-01-22 15:58:34 +11:00
parent 8d43341f1a
commit 825efdfc3b
6 changed files with 67 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0020-Better-more-flexible-itemstack-merging.patch
View File

@@ -1,4 +1,4 @@
From e0396f9b7cbcb5f22183d97bd5d2e3858f27ce52 Mon Sep 17 00:00:00 2001
From f3c3312ad255c5d61121f0e4e3db437fe7bc3b19 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 21 Jan 2013 14:31:25 +1100
Subject: [PATCH] Better + more flexible itemstack merging
@@ -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 3c6adb6..88b7f7a 100644
index 46e8d11..adb1312 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -927,30 +927,7 @@ public abstract class World implements IBlockAccess {
@@ -926,30 +926,7 @@ public abstract class World implements IBlockAccess {
} else if (entity instanceof EntityItem) {
event = CraftEventFactory.callItemSpawnEvent((EntityItem) entity);
// Spigot start
@@ -75,7 +75,7 @@ index 3c6adb6..88b7f7a 100644
EntityExperienceOrb xp = (EntityExperienceOrb) entity;
double radius = this.getWorld().expMergeRadius;
if (radius > 0) {
@@ -965,6 +942,7 @@ public abstract class World implements IBlockAccess {
@@ -964,6 +941,7 @@ public abstract class World implements IBlockAccess {
}
}
}