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

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CraftBukkit-Patches/0146-Alternative-Hopper-Ticking.patch
View File

@@ -1,4 +1,4 @@
From ee57713dd00e22d5629a29410922ed293163e3fe Mon Sep 17 00:00:00 2001
From 8209d8a46a505c4a154187e24327aaddfef4bc86 Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Sat, 19 Apr 2014 16:58:26 -0400
Subject: [PATCH] Alternative Hopper Ticking
@@ -45,10 +45,10 @@ index 9e64702..e1e626b 100644
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 2c95832..b5014b0 100644
index 45ae199..2e8c1e5 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -722,6 +722,11 @@ public class Chunk {
@@ -750,6 +750,11 @@ public class Chunk {
tileentity.t();
this.tileEntities.put(chunkposition, tileentity);
@@ -369,7 +369,7 @@ index b620394..c7b3495 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a879ae3..a2fa854 100644
index f429a88..cb6efc0 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -113,6 +113,7 @@ public abstract class World implements IBlockAccess {
@@ -423,7 +423,7 @@ index a879ae3..a2fa854 100644
// Spigot end
public BiomeBase getBiome(int i, int j) {
@@ -404,6 +441,14 @@ public abstract class World implements IBlockAccess {
@@ -407,6 +444,14 @@ public abstract class World implements IBlockAccess {
this.notifyAndUpdatePhysics(i, j, k, chunk, block1, block, i1);
// CraftBukkit end
}
@@ -438,10 +438,13 @@ index a879ae3..a2fa854 100644
return flag;
}
@@ -1455,6 +1500,7 @@ public abstract class World implements IBlockAccess {
@@ -1432,8 +1477,9 @@ public abstract class World implements IBlockAccess {
this.tileEntityList.removeAll(this.b);
this.b.clear();
}
// Spigot End
this.M = true;
- // CraftBukkit end
+ // Spigot End
+ this.initializeHoppers(); // Spigot - Initializes hoppers which have been added recently.
Iterator iterator = this.tileEntityList.iterator();