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

More upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-19 09:15:23 +10:00
parent 1752ff24d2
commit f8ca6ed867
136 changed files with 348 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 3b97fb4eaaef41db86499223495c75bdab2536c9 Mon Sep 17 00:00:00 2001
From 644d19dee7e8c63e7dce45426b0365e00633d1e9 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 13c0500..9d275b3 100644
index 4567ee2..234ea35 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -61,7 +61,7 @@ public abstract class World implements IBlockAccess {
@@ -48,7 +48,7 @@ index 13c0500..9d275b3 100644
public BiomeBase getBiome(int i, int j) {
if (this.isLoaded(i, 0, j)) {
Chunk chunk = this.getChunkAtWorldCoords(i, j);
@@ -125,6 +149,11 @@ public abstract class World implements IBlockAccess {
@@ -121,6 +145,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 13c0500..9d275b3 100644
this.K = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1915,24 +1944,44 @@ public abstract class World implements IBlockAccess {
@@ -1900,24 +1929,44 @@ public abstract class World implements IBlockAccess {
int k;
int l;
@@ -185,5 +185,5 @@ index 961ddb4..90a227f 100644
+ }
}
--
1.8.3.2
1.9.1