OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 14:33:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update CraftBukkit

Browse source
This commit is contained in:
Zach Brown 2016-02-05 04:12:16 -06:00
parent 3795e33bc1
commit 22c4861d76
3 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CraftBukkit

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

4
Spigot-Server-Patches/All-chunks-are-spawn-chunks-toggle.patch → Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch
View file

@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 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
@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
{ {
logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true ); useHopperCheck = getBoolean( "use-hopper-check", false );
} }
+ +
+ public boolean allChunksAreSlimeChunks; + public boolean allChunksAreSlimeChunks;

35
Spigot-Server-Patches/Make-duplicate-entity-UUID-logging-toggleable.patch
View file

@ -1,35 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
{
useHopperCheck = getBoolean( "use-hopper-check", false );
}
+
+ public boolean logDuplicateEntityUUIDs;
+ private void logDuplicateEntityUUIDs()
+ {
+ logDuplicateEntityUUIDs = getBoolean( "log-duplicate-entity-UUIDs", true );
+ }
}
--