core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

This commit is contained in:
Thinkofdeath 2015-03-16 16:15:28 +00:00 committed by Zach Brown
parent ab519bd34b
commit fdaf03d521
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 1efa454d7b8601827d72a561da2b68eb73b451c3 Mon Sep 17 00:00:00 2001 From 008870e6f7853620df13f818d842b38fd3cb8b34 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000 Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection Subject: [PATCH] Better Chunk Tick Selection
@ -112,10 +112,10 @@ index 89c8634..fbd1796 100644
this.methodProfiler.b(); this.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9b1af00..2bcf7d3 100644 index 04da01e..24ee706 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -350,12 +350,15 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -356,12 +356,15 @@ public class WorldServer extends World implements IAsyncTaskHandler {
protected void h() { protected void h() {
super.h(); super.h();
if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) { if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
@ -134,7 +134,7 @@ index 9b1af00..2bcf7d3 100644
} }
} else { } else {
@@ -367,9 +370,21 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -373,9 +376,21 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// ChunkCoordIntPair chunkcoordintpair1 = (ChunkCoordIntPair) iterator1.next(); // ChunkCoordIntPair chunkcoordintpair1 = (ChunkCoordIntPair) iterator1.next();
// int k = chunkcoordintpair1.x * 16; // int k = chunkcoordintpair1.x * 16;
// int l = chunkcoordintpair1.z * 16; // int l = chunkcoordintpair1.z * 16;
@ -159,7 +159,7 @@ index 9b1af00..2bcf7d3 100644
int k = chunkX * 16; int k = chunkX * 16;
int l = chunkZ * 16; int l = chunkZ * 16;
@@ -463,6 +478,12 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -469,6 +484,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
} }
} }

8
CraftBukkit-Patches/0012-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From 879e587ea31d3fc17233e8dca602c5ceb8911745 Mon Sep 17 00:00:00 2001 From 278839905bbaefedb7174999b94257775bc866b2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings
@ -529,10 +529,10 @@ index 52a801f..b831e55 100644
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d922a27..6b18563 100644 index d40c194..6ec9648 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -216,10 +216,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -222,10 +222,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals // CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals
long time = this.worldData.getTime(); long time = this.worldData.getTime();
if (this.getGameRules().getBoolean("doMobSpawning") && this.worldData.getType() != WorldType.DEBUG_ALL_BLOCK_STATES && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) { if (this.getGameRules().getBoolean("doMobSpawning") && this.worldData.getType() != WorldType.DEBUG_ALL_BLOCK_STATES && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) {
@ -547,7 +547,7 @@ index d922a27..6b18563 100644
this.methodProfiler.c("chunkSource"); this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks(); this.chunkProvider.unloadChunks();
int j = this.a(1.0F); int j = this.a(1.0F);
@@ -233,21 +236,34 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -239,21 +242,34 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldData.setDayTime(this.worldData.getDayTime() + 1L); this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
} }

6
CraftBukkit-Patches/0144-Fix-Corrupted-Trapped-Chest.patch
View File

@ -1,4 +1,4 @@
From 948620cfb80ebe099eccc51ab7b9dd67e49d3230 Mon Sep 17 00:00:00 2001 From 63daf48192bf5f8302ba38295b8f2bf2a6d28686 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 15 Aug 2014 00:56:41 -0400 Date: Fri, 15 Aug 2014 00:56:41 -0400
Subject: [PATCH] Fix Corrupted Trapped Chest Subject: [PATCH] Fix Corrupted Trapped Chest
@ -9,10 +9,10 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever
This will now fix Trapped Chests too. This will now fix Trapped Chests too.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ce76d4b..4c2eba3 100644 index 6ec9648..054f679 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -119,7 +119,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -125,7 +125,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
TileEntity result = super.getTileEntity(pos); TileEntity result = super.getTileEntity(pos);
Block type = getType(pos).getBlock(); Block type = getType(pos).getBlock();

6
CraftBukkit-Patches/0149-Limit-TNT-Detonations-per-tick.patch
View File

@ -1,4 +1,4 @@
From b460117a9217f26ba4959241de7c05dfbdec4976 Mon Sep 17 00:00:00 2001 From f45a49c9bdb5bb32cd52bf40301a9a65d07ffbf4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400 Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index 10f6e47..2d22327 100644
this.lastY = this.locY; this.lastY = this.locY;
this.lastZ = this.locZ; this.lastZ = this.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4c2eba3..1090707 100644 index 054f679..a599869 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -588,6 +588,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -594,6 +594,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
} }
super.tickEntities(); super.tickEntities();