Update CraftBukkit

This commit is contained in:
Zach Brown 2016-02-05 04:12:16 -06:00
parent d9169df994
commit b1492af86b
12 changed files with 30 additions and 67 deletions

@ -1 +1 @@
Subproject commit 039621dd44a2e07429d34d01832be5a066ba1d32 Subproject commit efe04b82b2dc2b1aedc55c10800d423bd8330ce1

View File

@ -1,37 +0,0 @@
From e66fdc98485e5aaf93ea9d9e5d223e35d137c48d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 28 Dec 2015 20:06:25 -0600
Subject: [PATCH] Make duplicate entity UUID logging toggleable
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6186f6c..3ec58dc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -995,7 +995,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
// CraftBukkit start
UUID uuid = entity.getUniqueID();
- if (this.entitiesByUUID.containsKey(uuid)) {
+ if (this.paperSpigotConfig.logDuplicateEntityUUIDs && this.entitiesByUUID.containsKey(uuid)) { // PaperSpigot - Make toggleable
Entity entity1 = (Entity) this.entitiesByUUID.get(uuid);
if (this.g.contains(entity1)) {
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index 7eb3463..add9680 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -382,4 +382,10 @@ public class PaperSpigotWorldConfig
{
useHopperCheck = getBoolean( "use-hopper-check", false );
}
+
+ public boolean logDuplicateEntityUUIDs;
+ private void logDuplicateEntityUUIDs()
+ {
+ logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
+ }
}
--
2.7.0

View File

@ -1,4 +1,4 @@
From 537501dd12855cf8648c87985aa4162ee9182457 Mon Sep 17 00:00:00 2001 From d847896561ec7e88530d2561b353c5d181349115 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 4 Jan 2016 00:16:08 -0600 Date: Mon, 4 Jan 2016 00:16:08 -0600
Subject: [PATCH] Process Entity Chunk Registration on Teleport Subject: [PATCH] Process Entity Chunk Registration on Teleport
@ -18,5 +18,5 @@ index efbf1a8..5df3476 100644
return true; return true;
} }
-- --
2.6.4 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From 8acb6dbd2a55f6f8552315497030911a10e71284 Mon Sep 17 00:00:00 2001 From a18b77ffab781c98e48ceea4c21cf68acab350ee Mon Sep 17 00:00:00 2001
From: chickeneer <emcchickeneer@gmail.com> From: chickeneer <emcchickeneer@gmail.com>
Date: Mon, 4 Jan 2016 00:19:32 -0600 Date: Mon, 4 Jan 2016 00:19:32 -0600
Subject: [PATCH] SPIGOT-1387: Resolve bed issues on unloaded chunks Subject: [PATCH] SPIGOT-1387: Resolve bed issues on unloaded chunks
@ -27,5 +27,5 @@ index cc1e33c..0ad4edb 100644
Block block = world.getType(blockposition).getBlock(); Block block = world.getType(blockposition).getBlock();
-- --
2.6.4 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From a74e60b0c8d1e751e7e8e29600c6068ece507919 Mon Sep 17 00:00:00 2001 From 6ee5f9facbcd8fb924f76c21d31ab60a8e45b52f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 8 Jan 2016 23:36:39 -0600 Date: Fri, 8 Jan 2016 23:36:39 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -559,7 +559,7 @@ index 13ab789..56cddeb 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 3ec58dc..9b18271 100644 index 6186f6c..ad51256 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
@@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -245,13 +245,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -1142,5 +1142,5 @@ index f6a67d6..93825d9 100644
{ {
int count = getInt( "settings.netty-threads", 4 ); int count = getInt( "settings.netty-threads", 4 );
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From 4ce89904d826282b5d3e775406360fe289c0e0fe Mon Sep 17 00:00:00 2001 From 4848135e06d958fd85b7cda96e131280270fb39c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 10 Jan 2016 20:40:33 -0600 Date: Sun, 10 Jan 2016 20:40:33 -0600
Subject: [PATCH] Disable chest cat detection Subject: [PATCH] Disable chest cat detection
@ -21,7 +21,7 @@ index f725aea..eed516e 100644
EntityOcelot entityocelot; EntityOcelot entityocelot;
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index add9680..f5a8d49 100644 index 7eb3463..b6ce3bb 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -193,10 +193,12 @@ public class PaperSpigotWorldConfig @@ -193,10 +193,12 @@ public class PaperSpigotWorldConfig
@ -38,5 +38,5 @@ index add9680..f5a8d49 100644
public boolean netherVoidTopDamage; public boolean netherVoidTopDamage;
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From e234b01e0a17f6930f80f9bbf9c481facb0bbaf3 Mon Sep 17 00:00:00 2001 From 3228daa638da4a8f5f70ad49d57ab2c84f555e10 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 8 Oct 2014 19:51:28 -0400 Date: Wed, 8 Oct 2014 19:51:28 -0400
Subject: [PATCH] Ensure commands are not ran async Subject: [PATCH] Ensure commands are not ran async
@ -82,5 +82,5 @@ index 97f9f96..a54b3e8 100644
return true; return true;
} }
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,7 +1,7 @@
From 22bdf678b9ba4cb81e795b74511ae04a1fc9f307 Mon Sep 17 00:00:00 2001 From a5cddf0754b5fada17bb1fa82675b46539fe8560 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es> From: vemacs <d@nkmem.es>
Date: Fri, 29 Jan 2016 02:28:17 -0600 Date: Fri, 29 Jan 2016 02:28:17 -0600
Subject: [PATCH] All chunks are spawn chunks toggle Subject: [PATCH] All chunks are slime spawn chunks toggle
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
@ -20,12 +20,12 @@ index d39df07..c927832 100644
} }
} }
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index f5a8d49..ecb9519 100644 index b6ce3bb..00057a1 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -390,4 +390,10 @@ public class PaperSpigotWorldConfig @@ -384,4 +384,10 @@ public class PaperSpigotWorldConfig
{ {
logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true ); useHopperCheck = getBoolean( "use-hopper-check", false );
} }
+ +
+ public boolean allChunksAreSlimeChunks; + public boolean allChunksAreSlimeChunks;
@ -35,5 +35,5 @@ index f5a8d49..ecb9519 100644
+ } + }
} }
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From 2834f7d0e06dcee31ff8b6a2ba13be95a913adb2 Mon Sep 17 00:00:00 2001 From 08d6547e66d3c8f7ad0fab9e4bde4741c2ca1386 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Fri, 29 Jan 2016 03:24:21 -0600 Date: Fri, 29 Jan 2016 03:24:21 -0600
Subject: [PATCH] Speedup BlockPos by fixing inlining Subject: [PATCH] Speedup BlockPos by fixing inlining
@ -73,7 +73,7 @@ index 0b2277c..a685e08 100644
} }
} }
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 2bd5499..8ea95f2 100644 index 2bd5499..0d0e0ab 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java --- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -198,9 +198,11 @@ public class BlockPosition extends BaseBlockPosition { @@ -198,9 +198,11 @@ public class BlockPosition extends BaseBlockPosition {
@ -152,5 +152,5 @@ index 2bd5499..8ea95f2 100644
} }
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From bdee0a5d95c65947fbdcf89320339f8267ac8581 Mon Sep 17 00:00:00 2001 From c01d3012a7608566bf361ca4392cb8c0085ea248 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jan 2016 03:39:09 -0600 Date: Fri, 29 Jan 2016 03:39:09 -0600
Subject: [PATCH] Remove completely invalid Redstone event for Netherrack Subject: [PATCH] Remove completely invalid Redstone event for Netherrack
@ -23,5 +23,5 @@ index 7daf006..0158497 100644
org.bukkit.block.Block bl = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()); org.bukkit.block.Block bl = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
int power = bl.getBlockPower(); int power = bl.getBlockPower();
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From 440a040fc1c9673186be49157299f67dfbb9167a Mon Sep 17 00:00:00 2001 From fc03f8e2a41a7fa9e6239985714d2509eb0a3e76 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com> From: DemonWav <demonwav@gmail.com>
Date: Sat, 30 Jan 2016 19:17:19 -0600 Date: Sat, 30 Jan 2016 19:17:19 -0600
Subject: [PATCH] Add Location support to tab completers (vanilla feature Subject: [PATCH] Add Location support to tab completers (vanilla feature
@ -134,10 +134,10 @@ index de788d6..db46eb0 100644
public static CommandSender lastSender = null; // Nasty :( public static CommandSender lastSender = null; // Nasty :(
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index ecb9519..008b79c 100644 index 00057a1..c3c374d 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -396,4 +396,10 @@ public class PaperSpigotWorldConfig @@ -390,4 +390,10 @@ public class PaperSpigotWorldConfig
{ {
allChunksAreSlimeChunks = getBoolean( "all-chunks-are-slime-chunks", false ); allChunksAreSlimeChunks = getBoolean( "all-chunks-are-slime-chunks", false );
} }
@ -149,5 +149,5 @@ index ecb9519..008b79c 100644
+ } + }
} }
-- --
2.7.0 2.7.0.windows.2

View File

@ -1,4 +1,4 @@
From 640d9af4079afb008d0e871446e87af89ff81387 Mon Sep 17 00:00:00 2001 From b79b958ca82c49a83def1f2f4e8f02fbf7ee7e9d Mon Sep 17 00:00:00 2001
From: Nik Gil <nikmanG@users.noreply.github.com> From: Nik Gil <nikmanG@users.noreply.github.com>
Date: Mon, 1 Feb 2016 23:47:24 -0700 Date: Mon, 1 Feb 2016 23:47:24 -0700
Subject: [PATCH] Made EntityDismountEvent Cancellable Subject: [PATCH] Made EntityDismountEvent Cancellable
@ -64,5 +64,5 @@ index 19a743c..c8b4e29 100644
this.q(this.vehicle); this.q(this.vehicle);
} }
-- --
2.7.0 2.7.0.windows.2