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

Stage 1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-12 14:18:37 +10:00
parent e8dcebdcd5
commit 28ccca81f4
113 changed files with 5701 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 8fe65d8a9c999b2ebca1f63634de6a03d83d2f39 Mon Sep 17 00:00:00 2001
From b532ab301efdcaa616bdfb70ab71cf81f838f2e3 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 96a3eb8..9dc2d73 100644
index 13c0500..9d275b3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -60,7 +60,7 @@ public abstract class World implements IBlockAccess {
@@ -61,7 +61,7 @@ public abstract class World implements IBlockAccess {
public Scoreboard scoreboard = new Scoreboard(); // CraftBukkit - protected -> public
public boolean isStatic;
// CraftBukkit start - public, longhashset
@@ -17,7 +17,7 @@ index 96a3eb8..9dc2d73 100644
private int K;
public boolean allowMonsters;
public boolean allowAnimals;
@@ -75,6 +75,30 @@ public abstract class World implements IBlockAccess {
@@ -76,6 +76,30 @@ public abstract class World implements IBlockAccess {
private boolean M;
int[] I;
@@ -48,7 +48,7 @@ index 96a3eb8..9dc2d73 100644
public BiomeBase getBiome(int i, int j) {
if (this.isLoaded(i, 0, j)) {
Chunk chunk = this.getChunkAtWorldCoords(i, j);
@@ -124,6 +148,11 @@ public abstract class World implements IBlockAccess {
@@ -125,6 +149,11 @@ public abstract class World implements IBlockAccess {
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit
// CraftBukkit end
@@ -60,7 +60,7 @@ index 96a3eb8..9dc2d73 100644
this.K = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1914,24 +1943,44 @@ public abstract class World implements IBlockAccess {
@@ -1915,24 +1944,44 @@ public abstract class World implements IBlockAccess {
int k;
int l;
@@ -116,10 +116,10 @@ index 96a3eb8..9dc2d73 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 4e0861e..acb0be1 100644
index 843761a..01d7105 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -306,10 +306,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -307,10 +307,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
// CraftBukkit start
// Iterator iterator = this.chunkTickList.iterator();
@@ -143,7 +143,7 @@ index 4e0861e..acb0be1 100644
int k = chunkX * 16;
int l = chunkZ * 16;
@@ -400,6 +410,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -401,6 +411,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
if (block.isTicking()) {
++i;
@@ -151,7 +151,7 @@ index 4e0861e..acb0be1 100644
block.a(this, k2 + k, i3 + chunksection.getYPosition(), l2 + l, this.random);
}
}
@@ -408,6 +419,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -409,6 +420,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
this.methodProfiler.b();
}
@@ -185,5 +185,5 @@ index 961ddb4..90a227f 100644
+ }
}
--
1.8.5.2.msysgit.0
1.8.3.2