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

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 9b78ae248d0ceeb4a95acb67ec78185c63aaa061 Mon Sep 17 00:00:00 2001
From 2f1db462086493e906e383db29bcf5e3435378ba 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 028e4ce..038aa40 100644
index cd529ec..53ab411 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess {
@@ -17,7 +17,7 @@ index 028e4ce..038aa40 100644
private int L;
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 N;
int[] I;
@@ -48,7 +48,7 @@ index 028e4ce..038aa40 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 028e4ce..038aa40 100644
this.L = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1897,24 +1926,44 @@ public abstract class World implements IBlockAccess {
@@ -1903,24 +1932,44 @@ public abstract class World implements IBlockAccess {
int j;
int k;