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

Update to Minecraft 1.6.1 - Phase 1

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-02 13:03:56 +10:00
parent 915e0f00f2
commit acb5c443c4
44 changed files with 547 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
View File

@@ -1,11 +1,11 @@
From a4f3a529237119d805302947bd76ddb384bd9379 Mon Sep 17 00:00:00 2001
From 7b266e982dfda605efd4355fd0947d5f1ef34bac Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index de052bd..bc692dd 100644
index 0dc673d..41baf2b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -66,13 +66,35 @@ public abstract class World implements IBlockAccess {
@@ -57,7 +57,7 @@ index de052bd..bc692dd 100644
this.O = this.random.nextInt(12000);
this.H = new int['\u8000'];
@@ -1956,24 +1983,44 @@ public abstract class World implements IBlockAccess {
@@ -1955,24 +1982,44 @@ public abstract class World implements IBlockAccess {
int j;
int k;
@@ -113,10 +113,10 @@ index de052bd..bc692dd 100644
this.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 49360c1..6c3fcf1 100644
index e787fb1..09d076e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -301,9 +301,19 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -300,9 +300,19 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
// CraftBukkit start
// Iterator iterator = this.chunkTickList.iterator();
@@ -139,7 +139,7 @@ index 49360c1..6c3fcf1 100644
// ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) iterator.next();
int k = chunkX * 16;
int l = chunkZ * 16;
@@ -401,6 +411,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -400,6 +410,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
if (block != null && block.isTicking()) {
++i;