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

Re-enable light queue toggle, optimize neighbor checks, add max queue time 

light queue is actually buggy, so re-enabling the config.

however, if anyone is ok with the buggy behavior, made the max time lost due to
light queue configurable.

We want to get to making the ligth queue default if we can make it work perfectly.

also applying neighbor optimizations to use the faster method for light checks.
This commit is contained in:
Aikar 2018-09-26 00:57:59 -04:00
parent e1ba203df8
commit 5cdfbda4e4
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
67 changed files with 303 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From c4dc3979a681aac06deeda8f8a3ff0939108b413 Mon Sep 17 00:00:00 2001
From 0456b068872c42d73906d26a8cbba37ea9be9ae6 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue
@ -27,23 +27,41 @@ index 145cb274b0..eff9dcf54f 100644
}
public static Timing getTickList(WorldServer worldserver, String timingsType) {
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 4812da0dac..d0eb7c0fc2 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -184,6 +184,11 @@ public class PaperConfig {
return config.getString(path, config.getString(path));
}
+ public static int maxTickMsLostLightQueue;
+ private static void lightQueue() {
+ maxTickMsLostLightQueue = getInt("queue-light-updates-max-loss", 10);
+ }
+
private static void timings() {
boolean timings = getBoolean("timings.enabled", true);
boolean verboseTimings = getBoolean("timings.verbose", true);
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 39d565db1f..9fd1bde0ef 100644
index 39d565db1f..8f6f0288be 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -130,4 +130,10 @@ public class PaperWorldConfig {
@@ -130,4 +130,12 @@ public class PaperWorldConfig {
netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
log("Top of the nether void damage: " + netherVoidTopDamage);
}
+
+ public boolean queueLightUpdates = true; // This doesn't need to be configurable, it's not buggy.
+ public boolean queueLightUpdates;
+ private void queueLightUpdates() {
+ //queueLightUpdates = getBoolean("queue-light-updates", false);
+ //log("Lighting Queue enabled: " + queueLightUpdates);
+ queueLightUpdates = getBoolean("queue-light-updates", false);
+ log("Lighting Queue enabled: " + queueLightUpdates);
+ log("Warning: This feature may help reduce TPS loss from light, but comes at the cost of buggy light data");
+ log("We are working to improve this feature.");
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 4622e92b05..703c377f93 100644
index 4622e92b05..e43442c8bd 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -38,7 +38,7 @@ public class Chunk implements IChunkAccess {
@ -63,14 +81,27 @@ index 4622e92b05..703c377f93 100644
// Paper end
public boolean areNeighborsLoaded(final int radius) {
switch (radius) {
@@ -277,6 +278,7 @@ public class Chunk implements IChunkAccess {
@@ -277,9 +278,10 @@ public class Chunk implements IChunkAccess {
this.l = true;
}
+ private void recheckGaps(boolean flag) { g(flag); } // Paper - OBFHELPER
private void g(boolean flag) {
this.world.methodProfiler.a("recheckGaps");
if (this.world.areChunksLoaded(new BlockPosition(this.locX * 16 + 8, 0, this.locZ * 16 + 8), 16)) {
- if (this.world.areChunksLoaded(new BlockPosition(this.locX * 16 + 8, 0, this.locZ * 16 + 8), 16)) {
+ if (this.areNeighborsLoaded(1)) { // Paper
for (int i = 0; i < 16; ++i) {
for (int j = 0; j < 16; ++j) {
if (this.g[i + j * 16]) {
@@ -330,7 +332,7 @@ public class Chunk implements IChunkAccess {
}
private void a(int i, int j, int k, int l) {
- if (l > k && this.world.areChunksLoaded(new BlockPosition(i, 0, j), 16)) {
+ if (l > k && this.areNeighborsLoaded(1)) { // Paper
for (int i1 = k; i1 < l; ++i1) {
this.world.c(EnumSkyBlock.SKY, new BlockPosition(i, i1, j));
}
@@ -530,6 +532,7 @@ public class Chunk implements IChunkAccess {
if (flag1) {
this.initLighting();
@ -159,19 +190,20 @@ index d6ea4ae532..5086fe4027 100644
}
diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java
new file mode 100644
index 0000000000..84e313bf8c
index 0000000000..bfb05e8766
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java
@@ -0,0 +1,98 @@
@@ -0,0 +1,99 @@
+package net.minecraft.server;
+
+import co.aikar.timings.Timing;
+import com.destroystokyo.paper.PaperConfig;
+import it.unimi.dsi.fastutil.objects.ObjectCollection;
+
+import java.util.ArrayDeque;
+
+class PaperLightingQueue {
+ private static final long MAX_TIME = (long) (1000000000 / 20 * .95);
+ private static final long MAX_TIME = (long) (1000000 * (50 + PaperConfig.maxTickMsLostLightQueue));
+
+ static void processQueue(long curTime) {
+ final long startTime = System.nanoTime();

10
Spigot-Server-Patches/0029-Configurable-end-credits.patch
View File

@ -1,16 +1,16 @@
From 0d4bbe55a64c6a48f3a3416166665d87c4112ac0 Mon Sep 17 00:00:00 2001
From dd6c5ececa6159d0c741ed1d5070ba1c65ce9303 Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Wed, 16 Mar 2016 02:21:39 -0500
Subject: [PATCH] Configurable end credits
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 9fd1bde0ef..29d5f30545 100644
index 8f6f0288be..5aee23dceb 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -136,4 +136,10 @@ public class PaperWorldConfig {
//queueLightUpdates = getBoolean("queue-light-updates", false);
//log("Lighting Queue enabled: " + queueLightUpdates);
@@ -138,4 +138,10 @@ public class PaperWorldConfig {
log("Warning: This feature may help reduce TPS loss from light, but comes at the cost of buggy light data");
log("We are working to improve this feature.");
}
+
+ public boolean disableEndCredits;

8
Spigot-Server-Patches/0031-Optimize-explosions.patch
View File

@ -1,4 +1,4 @@
From d82e6a9a1c15815dea09b2b38f2239e6f606bc93 Mon Sep 17 00:00:00 2001
From ec6d0fe89ca68ea6e27a03bd0921ce2d731ea395 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 11:59:48 -0600
Subject: [PATCH] Optimize explosions
@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
an entity's exposure during an explosion.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index aa2f5414b0..bd1ac77aef 100644
index 5aee23dceb..2ec3d93551 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -142,4 +142,10 @@ public class PaperWorldConfig {
@@ -144,4 +144,10 @@ public class PaperWorldConfig {
disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
log("End credits disabled: " + disableEndCredits);
}
@ -25,7 +25,7 @@ index aa2f5414b0..bd1ac77aef 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 2620c4c2bd..a31e07b903 100644
index c7d11cf621..d0ba510023 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -137,7 +137,7 @@ public class Explosion {

12
Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
View File

@ -1,14 +1,14 @@
From f66b7805e8b3749a50b005653714f54c6d93a214 Mon Sep 17 00:00:00 2001
From 0d8064d1842895f71ea36b249c8723b1ca743209 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:48:03 -0600
Subject: [PATCH] Disable explosion knockback
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index ae4a7cb097..f2f45ae4a6 100644
index 2ec3d93551..4679246662 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -148,4 +148,9 @@ public class PaperWorldConfig {
@@ -150,4 +150,9 @@ public class PaperWorldConfig {
optimizeExplosions = getBoolean("optimize-explosions", false);
log("Optimize explosions: " + optimizeExplosions);
}
@ -19,7 +19,7 @@ index ae4a7cb097..f2f45ae4a6 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 8a41a1dca8..dd216c64e9 100644
index ce79887cf4..961da5bf97 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1006,6 +1006,7 @@ public abstract class EntityLiving extends Entity {
@ -48,7 +48,7 @@ index 8a41a1dca8..dd216c64e9 100644
if (!this.e(damagesource)) {
SoundEffect soundeffect = this.cs();
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index e440d6d631..3521d9e10c 100644
index d0ba510023..8180b3ef38 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -153,7 +153,7 @@ public class Explosion {
@ -70,5 +70,5 @@ index e440d6d631..3521d9e10c 100644
}
}
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0034-Disable-thunder.patch
View File

@ -1,14 +1,14 @@
From 703ce6a2582f6aea1e9134b9468232cdb0481382 Mon Sep 17 00:00:00 2001
From 3de68b79f98b2fc517ad7300d8c1e0d8b9940bc7 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:52:43 -0600
Subject: [PATCH] Disable thunder
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f2f45ae4a..a27e52d03 100644
index 4679246662..13253f6e9c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -153,4 +153,9 @@ public class PaperWorldConfig {
@@ -155,4 +155,9 @@ public class PaperWorldConfig {
private void disableExplosionKnockback(){
disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
}
@ -19,7 +19,7 @@ index f2f45ae4a..a27e52d03 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f032ecab6..5ee771e83 100644
index e4d03b6779..f39ce330f6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -491,7 +491,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index f032ecab6..5ee771e83 100644
l = this.m >> 2;
blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
View File

@ -1,14 +1,14 @@
From 227e944778893d855f8d85e11d8ffd0dad2354ec Mon Sep 17 00:00:00 2001
From 4da0d767e1e909a98ed9e0714241d187b9d0af61 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:57:24 -0600
Subject: [PATCH] Disable ice and snow
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index a27e52d03..ab119b914 100644
index 13253f6e9c..cde9c11f4d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -158,4 +158,9 @@ public class PaperWorldConfig {
@@ -160,4 +160,9 @@ public class PaperWorldConfig {
private void disableThunder() {
disableThunder = getBoolean("disable-thunder", false);
}
@ -19,7 +19,7 @@ index a27e52d03..ab119b914 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5ee771e83..dd09ab20e 100644
index f39ce330f6..2341ce3f93 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -513,7 +513,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index 5ee771e83..dd09ab20e 100644
l = this.m >> 2;
blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
View File

@ -1,14 +1,14 @@
From a2dce69cf0a7c65dc36e93f20528370a4f6f7c7b Mon Sep 17 00:00:00 2001
From 5084976937dafe4c17533cb903f03ebd209b510e Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 15:03:53 -0600
Subject: [PATCH] Configurable mob spawner tick rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index ab119b914..59bd3e28f 100644
index cde9c11f4d..40766d81c7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -163,4 +163,9 @@ public class PaperWorldConfig {
@@ -165,4 +165,9 @@ public class PaperWorldConfig {
private void disableIceAndSnow(){
disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
}
@ -19,7 +19,7 @@ index ab119b914..59bd3e28f 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index e9650d962..61472a0eb 100644
index b091c89fb1..02ec6b10f5 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -22,6 +22,7 @@ public abstract class MobSpawnerAbstract {
@ -64,5 +64,5 @@ index e9650d962..61472a0eb 100644
}
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
View File

@ -1,14 +1,14 @@
From 6cc696059b4b3ef049c573f7387d240db3bcff54 Mon Sep 17 00:00:00 2001
From ad5a57826bb72f193f38d159b7370ce59a6c7d67 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 23:34:44 -0600
Subject: [PATCH] Configurable container update tick rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 77ad8687..34007dbf 100644
index 40766d81c7..71af3fcfed 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -168,4 +168,9 @@ public class PaperWorldConfig {
@@ -170,4 +170,9 @@ public class PaperWorldConfig {
private void mobSpawnerTickRate() {
mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
}
@ -19,7 +19,7 @@ index 77ad8687..34007dbf 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 95ab3d2c..a279bf93 100644
index 95ab3d2cda..a279bf9383 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -71,6 +71,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -45,5 +45,5 @@ index 95ab3d2c..a279bf93 100644
this.closeInventory();
this.activeContainer = this.defaultContainer;
--
2.18.0.windows.1
2.19.0

10
Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
View File

@ -1,14 +1,14 @@
From 14bab37b82c4924cb1ece931a0a2c57a9a54bfe8 Mon Sep 17 00:00:00 2001
From 3f3d6fcab054bb9d075535721e4dff0b5fb68b36 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:46:57 -0600
Subject: [PATCH] Configurable Chunk IO Thread Base Count
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index e4ed7d674..d48ef7e85 100644
index d0eb7c0fc2..12a56f6147 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -203,4 +203,9 @@ public class PaperConfig {
@@ -208,4 +208,9 @@ public class PaperConfig {
" - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
" - Length: " + timeSummary(Timings.getHistoryLength() / 20));
}
@ -19,7 +19,7 @@ index e4ed7d674..d48ef7e85 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
index e4fd9bc60..7b7a3d01b 100644
index e4fd9bc604..7b7a3d01b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
@@ -1,5 +1,6 @@
@ -39,5 +39,5 @@ index e4fd9bc60..7b7a3d01b 100644
private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch
View File

@ -1,4 +1,4 @@
From b24a519f9092f69021b72e5a48e3c8514669932a Mon Sep 17 00:00:00 2001
From ccf869e8a33ffd31f1c7098cfff42a9fd7d2e743 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:13:45 -0600
Subject: [PATCH] Configurable Disabling Cat Chest Detection
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
Offers a gameplay feature to stop cats from blocking chests
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 34007dbf4f..b27934cfc5 100644
index 71af3fcfed..e28d5b19a3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -173,4 +173,9 @@ public class PaperWorldConfig {
@@ -175,4 +175,9 @@ public class PaperWorldConfig {
private void containerUpdateTickRate() {
containerUpdateTickRate = getInt("container-update-tick-rate", 1);
}
@ -36,5 +36,5 @@ index 5401f7d754..27e6d2b5f2 100644
if (!list.isEmpty()) {
for(EntityOcelot entityocelot : list) {
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
View File

@ -1,14 +1,14 @@
From 53637e35e4d08e9a4d50f0c1b2416fb12097d3f2 Mon Sep 17 00:00:00 2001
From dfaa55f4e9b36525ab7f7157051499109b735547 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Thu, 3 Mar 2016 01:19:22 -0600
Subject: [PATCH] All chunks are slime spawn chunks toggle
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index d91b48b0ae..7d1f6cde94 100644
index e28d5b19a3..3528b674fc 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -178,4 +178,9 @@ public class PaperWorldConfig {
@@ -180,4 +180,9 @@ public class PaperWorldConfig {
private void disableChestCatDetection() {
disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
}
@ -32,5 +32,5 @@ index 9e0df95607..238f3c7926 100644
if (this.random.nextInt(10) == 0 && flag1 && this.locY < 40.0D) {
return super.a(generatoraccess, flag);
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
View File

@ -1,14 +1,14 @@
From 34714cc6991d2727f764745fdae5a08c88a8e87f Mon Sep 17 00:00:00 2001
From 46029afee41c28fb042bb48bab28a32a293bf7bd Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7d1f6cde94..c982869995 100644
index 3528b674fc..9db394d4ff 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -183,4 +183,9 @@ public class PaperWorldConfig {
@@ -185,4 +185,9 @@ public class PaperWorldConfig {
private void allChunksAreSlimeChunks() {
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
}
@ -54,5 +54,5 @@ index d4639c8221..e1eb3aa0f3 100644
private boolean canCreatePortal = true;
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
View File

@ -1,4 +1,4 @@
From 3f7bd3fd28d287f558a40a06fea932312f1daa8b Mon Sep 17 00:00:00 2001
From 59c58eda01136297cb0ecc512f42eeb3abeb6ba0 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Configurable inter-world teleportation safety
@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
This only is the case if the player is teleporting between worlds.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 86ec62fb3f..da68152a70 100644
index 9db394d4ff..50837d767f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -188,4 +188,9 @@ public class PaperWorldConfig {
@@ -190,4 +190,9 @@ public class PaperWorldConfig {
private void portalSearchRadius() {
portalSearchRadius = getInt("portal-search-radius", 128);
}
@ -57,5 +57,5 @@ index f518e94fe9..42ee0efc1b 100644
return true;
}
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
View File

@ -1,4 +1,4 @@
From 3fb25bf7d30a4e0dbe2d2e7e45260f78b0badc32 Mon Sep 17 00:00:00 2001
From ce75d9ed561e8349ed8ea8b1aad81bb1ebfa5f48 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default
@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
logic which is most likely to be true.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index da68152a70..1d23a07389 100644
index 50837d767f..898068a817 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -193,4 +193,9 @@ public class PaperWorldConfig {
@@ -195,4 +195,9 @@ public class PaperWorldConfig {
private void disableTeleportationSuffocationCheck() {
disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
}
@ -37,7 +37,7 @@ index b61a7706fa..1722573ffc 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b9783ce056..58fe9f2ab3 100644
index 961da5bf97..91baaa5062 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity {
@ -49,5 +49,5 @@ index b9783ce056..58fe9f2ab3 100644
if (!flag) {
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
View File

@ -1,4 +1,4 @@
From 1f1de0e88a43b88331553bbd92b9dfedb6991c5a Mon Sep 17 00:00:00 2001
From 6bc2658cdc074c1594d3b22de8c3f12bf7cda691 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements
@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0d68ffd75a..fd00c320ce 100644
index 12a56f6147..18296f1e1b 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -208,4 +208,10 @@ public class PaperConfig {
@@ -213,4 +213,10 @@ public class PaperConfig {
private static void chunkLoadThreads() {
minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
}
@ -201,5 +201,5 @@ index a3aba244af..97917551a4 100644
if (this.c.isEmpty()) {
--
2.18.0
2.19.0

8
Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
View File

@ -1,4 +1,4 @@
From 9ae6d5bb154a255ed037602cad78b8b06d1722e6 Mon Sep 17 00:00:00 2001
From be0d1a10650fe1ca271d8f011029fc4f92ce24bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
A config option has been added for those who depend on the previous behavior, but I don't expect that.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index fd00c320c..620f23f4f 100644
index 18296f1e1b..5ae78efdfe 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -214,4 +214,9 @@ public class PaperConfig {
@@ -219,4 +219,9 @@ public class PaperConfig {
enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
}
@ -30,7 +30,7 @@ index fd00c320c..620f23f4f 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 17fdc58bd..385063d8a 100644
index 17fdc58bd0..385063d8aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -337,6 +337,7 @@ public final class CraftServer implements Server {

10
Spigot-Server-Patches/0067-Undead-horse-leashing.patch
View File

@ -1,4 +1,4 @@
From d42451ddbcec9ccf105db6654eaea64ef60471ae Mon Sep 17 00:00:00 2001
From 31db0c295b6a7795af976ad47c1303ecb3b87f76 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:19:19 -0400
Subject: [PATCH] Undead horse leashing
@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
default false to match vanilla, but option to allow undead horse types to be leashed.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 2b25da046..6f96627a2 100644
index 898068a817..c2845266e2 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -198,4 +198,9 @@ public class PaperWorldConfig {
@@ -200,4 +200,9 @@ public class PaperWorldConfig {
private void nonPlayerEntitiesOnScoreboards() {
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
}
@ -20,7 +20,7 @@ index 2b25da046..6f96627a2 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 2af12985e..7c8053acd 100644
index 4d4880aa2a..1699ccee50 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -113,7 +113,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@ -33,5 +33,5 @@ index 2af12985e..7c8053acd 100644
protected void u(float f) {
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 69f6dac1f8e342ccf68834f614debb45534b9992 Mon Sep 17 00:00:00 2001
From 378942b6c4acb8ba353194471f3e007ef24de4d4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 15:12:22 -0400
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
Can set a much shorter despawn rate for arrows that players can not pick up.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f238394923..7b821ebf16 100644
index c2845266e2..795545245a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -203,4 +203,19 @@ public class PaperWorldConfig {
@@ -205,4 +205,19 @@ public class PaperWorldConfig {
private void allowLeashingUndeadHorse() {
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
}

6
Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
View File

@ -1,14 +1,14 @@
From 0d2223784694eaef2699c7b8a68e9cbd0edc2231 Mon Sep 17 00:00:00 2001
From ad6c8ae5dadadd8b7fb23d9c93f1aba50c6a4987 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 22 Mar 2016 12:04:28 -0500
Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7b821ebf16..e968a47b94 100644
index 795545245a..0faef7cf28 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -218,4 +218,12 @@ public class PaperWorldConfig {
@@ -220,4 +220,12 @@ public class PaperWorldConfig {
log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
}

6
Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
View File

@ -1,4 +1,4 @@
From 33fbd58a20a30567156ab703b10c60cb246c2367 Mon Sep 17 00:00:00 2001
From 433f7d7b92ae9a2ba2e5a10ad16d197a27e2b003 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
by saving millions of event calls on redstone heavy servers.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index e968a47b94..85acc8f3d9 100644
index 0faef7cf28..deb4ec2543 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -226,4 +226,9 @@ public class PaperWorldConfig {
@@ -228,4 +228,9 @@ public class PaperWorldConfig {
skeleHorseSpawnChance = 0.01D; // Vanilla value
}
}

8
Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
View File

@ -1,4 +1,4 @@
From 2e536456c28522dbe832ea41424296bf5cfd01e2 Mon Sep 17 00:00:00 2001
From c3f08fd75a1a0b15b50b64ae94c504f1c0c6199c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:46:14 -0400
Subject: [PATCH] Configurable Chunk Inhabited Timer
@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
For people who want all chunks to be treated equally, you can disable the timer.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 85acc8f3d9..e15589d895 100644
index deb4ec2543..dd23ea45e5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -231,4 +231,9 @@ public class PaperWorldConfig {
@@ -233,4 +233,9 @@ public class PaperWorldConfig {
private void firePhysicsEventForRedstone() {
firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
}
@ -23,7 +23,7 @@ index 85acc8f3d9..e15589d895 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index a36034cc52..7e1a90d904 100644
index e279f97d77..35be0a3fc1 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1246,7 +1246,7 @@ public class Chunk implements IChunkAccess {

8
Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
View File

@ -1,4 +1,4 @@
From 50e9e6cf5da5ca1f8164d381866328dffc36fcd4 Mon Sep 17 00:00:00 2001
From 972dd99cdc558049c41b4e92ce7974b3ddefff8c Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 08:22:55 +0300
Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
The maximum size of the RegionFileCache is also made configurable.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 620f23f4f0..a6042ca607 100644
index 5ae78efdfe..94ba257c2d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -219,4 +219,9 @@ public class PaperConfig {
@@ -224,4 +224,9 @@ public class PaperConfig {
private static void loadPermsBeforePlugins() {
loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
}
@ -77,5 +77,5 @@ index 2217adf99c..c0ab543b91 100644
Iterator iterator = RegionFileCache.a.values().iterator();
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
View File

@ -1,14 +1,14 @@
From f6ea6310f7a0495954dd970acd2c50819f2e3390 Mon Sep 17 00:00:00 2001
From 92db70f012d7896c9da4fc6386c51e20df08d2a1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 16:28:17 -0400
Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index e15589d895..4f62ace8e3 100644
index dd23ea45e5..17755108a8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -236,4 +236,10 @@ public class PaperWorldConfig {
@@ -238,4 +238,10 @@ public class PaperWorldConfig {
private void useInhabitedTime() {
useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
}

14
Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -1,4 +1,4 @@
From 9ab72b9ab2e2385631e170f57d9366709441ddeb Mon Sep 17 00:00:00 2001
From 4e0414000856c4febcebbaa912228717e9e183de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 4f62ace8e..dd9a8c39a 100644
index 17755108a8..6fe3c0ea8a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -242,4 +242,10 @@ public class PaperWorldConfig {
@@ -244,4 +244,10 @@ public class PaperWorldConfig {
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
log("Grass Spread Tick Rate: " + grassUpdateRate);
}
@ -21,7 +21,7 @@ index 4f62ace8e..dd9a8c39a 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index abed6bb97..8056dc40d 100644
index abed6bb977..8056dc40df 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -63,7 +63,7 @@ index abed6bb97..8056dc40d 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b8fcfb609..411cfedd2 100644
index b8fcfb6092..411cfedd25 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2881,8 +2881,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -78,7 +78,7 @@ index b8fcfb609..411cfedd2 100644
public LongSet ag() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index eb17d5e95..ffa6a46b7 100644
index eb17d5e957..ffa6a46b78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
@ -91,7 +91,7 @@ index eb17d5e95..ffa6a46b7 100644
for (int j = -short1; j <= short1; j += 16) {
for (int k = -short1; k <= short1; k += 16) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ac44dfeef..50923951a 100644
index ac44dfeefb..50923951a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1275,8 +1275,9 @@ public class CraftWorld implements World {

6
Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
View File

@ -1,14 +1,14 @@
From 695f460f763891dde42bc64be4e47a82531ccb62 Mon Sep 17 00:00:00 2001
From cec19ced0037b20703b306ec306aa712a8cc7371 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index dd9a8c39ac..8a76150cfb 100644
index 6fe3c0ea8a..cf523a3e48 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -248,4 +248,9 @@ public class PaperWorldConfig {
@@ -250,4 +250,9 @@ public class PaperWorldConfig {
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
}

10
Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
View File

@ -1,14 +1,14 @@
From 195aa61857efd8a86fbf6826cdba5eefc31f3d6f Mon Sep 17 00:00:00 2001
From 0ad1c1c223f79070d9b2eb5da014f4eee0885730 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 02:10:49 -0400
Subject: [PATCH] Configurable Player Collision
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index a6042ca607..9fe1311143 100644
index 94ba257c2d..24a3e94fc8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -224,4 +224,9 @@ public class PaperConfig {
@@ -229,4 +229,9 @@ public class PaperConfig {
private static void regionFileCacheSize() {
regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
}
@ -19,7 +19,7 @@ index a6042ca607..9fe1311143 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 280e684db4..9675d5a100 100644
index 8056dc40df..74c84dda69 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -425,6 +425,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -114,5 +114,5 @@ index 8121f8e40a..02dbb8c6c3 100644
// CraftBukkit start
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
View File

@ -1,14 +1,14 @@
From aa0b6c9ff279deb6b28cba214bb3980e73efb996 Mon Sep 17 00:00:00 2001
From 3f001c5aae3187744325aec06a94e979bfcd335a Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 21 Apr 2016 23:51:55 -0700
Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 8a76150cfb..1afc113e77 100644
index cf523a3e48..4f921dbd38 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -253,4 +253,14 @@ public class PaperWorldConfig {
@@ -255,4 +255,14 @@ public class PaperWorldConfig {
private void useVanillaScoreboardColoring() {
useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
}

6
Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
View File

@ -1,4 +1,4 @@
From 883120e054e15f375fb50d93b96bc60d28ad32ce Mon Sep 17 00:00:00 2001
From 1abf5eb6058a9e3eaeca3071d174db4d6336de67 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 21:19:14 -0400
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
do not suffer with "Every chest has been looted"
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 1afc113e77..3822a119b5 100644
index 4f921dbd38..db3e70e97a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -263,4 +263,26 @@ public class PaperWorldConfig {
@@ -265,4 +265,26 @@ public class PaperWorldConfig {
this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
}

8
Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
View File

@ -1,14 +1,14 @@
From e55c4df2d0b9ab32522e632bb4db0b35066f3f70 Mon Sep 17 00:00:00 2001
From a307cfab4e99cd58eae334a625bd118d2cb6afda Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 May 2016 23:33:08 -0400
Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 9fe1311143..a1110da38e 100644
index 24a3e94fc8..369f503532 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -229,4 +229,9 @@ public class PaperConfig {
@@ -234,4 +234,9 @@ public class PaperConfig {
private static void enablePlayerCollisions() {
enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
}
@ -31,5 +31,5 @@ index f2e8eface3..895ea0eb41 100644
nbttagcompound.setString("Name", scoreboardteam.getName());
nbttagcompound.setString("DisplayName", IChatBaseComponent.ChatSerializer.a(scoreboardteam.getDisplayName()));
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
View File

@ -1,11 +1,11 @@
From c4f5e75879f9d865e246ad3c0e95afe61737259c Mon Sep 17 00:00:00 2001
From 256e32e72d31dd0a1c7d3f09116c7c84fd6b38ab Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional TNT doesn't move in water
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 3822a119b5..4b2dcfd1df 100644
index db3e70e97a..ff1a2046f6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@ -16,7 +16,7 @@ index 3822a119b5..4b2dcfd1df 100644
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -285,4 +284,14 @@ public class PaperWorldConfig {
@@ -287,4 +286,14 @@ public class PaperWorldConfig {
);
}
}

8
Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
View File

@ -1,4 +1,4 @@
From 7465d7be397a9d9ffe94a32b41501bdfe77a72f3 Mon Sep 17 00:00:00 2001
From bf7d878872dbb0130ca064d5d083c572ec3ff81c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 4b2dcfd1df..62268d34d1 100644
index ff1a2046f6..0cd15c17e8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -294,4 +294,18 @@ public class PaperWorldConfig {
@@ -296,4 +296,18 @@ public class PaperWorldConfig {
preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
}
@ -40,7 +40,7 @@ index 4b2dcfd1df..62268d34d1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7e1a90d904..7f1d0b39cf 100644
index 35be0a3fc1..297ead5a77 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {

10
Spigot-Server-Patches/0130-Add-setting-for-proxy-online-mode-status.patch
View File

@ -1,14 +1,14 @@
From 05c889ecfe1b1a812159ece4b63964da2b30ab99 Mon Sep 17 00:00:00 2001
From c3a424cad8d3dad452fbd4b1e95aea766635d36c Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Fri, 5 Aug 2016 01:03:08 +0200
Subject: [PATCH] Add setting for proxy online mode status
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index a1110da38..0a8fc7927 100644
index 369f503532..2fc6585c0e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -234,4 +234,9 @@ public class PaperConfig {
@@ -239,4 +239,9 @@ public class PaperConfig {
private static void saveEmptyScoreboardTeams() {
saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
}
@ -19,7 +19,7 @@ index a1110da38..0a8fc7927 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index 58d971cf2..8a2ff6a41 100644
index 58d971cf20..8a2ff6a413 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -60,7 +60,8 @@ public class NameReferencingFileConverter {
@ -33,7 +33,7 @@ index 58d971cf2..8a2ff6a41 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ffa6a46b7..fe2e22f67 100644
index ffa6a46b78..fe2e22f67a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1408,7 +1408,8 @@ public final class CraftServer implements Server {

10
Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
View File

@ -1,14 +1,14 @@
From de3872ae39d2d23557256ea7d20a8f35808790d9 Mon Sep 17 00:00:00 2001
From 6db5fa5b0827cd005ec846e2b949b02b58145fa0 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 11 Sep 2016 14:30:57 -0500
Subject: [PATCH] Configurable packet in spam threshold
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0a8fc7927a..b496bc3869 100644
index 2fc6585c0e..d78f6516e5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -239,4 +239,13 @@ public class PaperConfig {
@@ -244,4 +244,13 @@ public class PaperConfig {
private static void bungeeOnlineMode() {
bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
}
@ -23,7 +23,7 @@ index 0a8fc7927a..b496bc3869 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index def0db5fea..830f3a89a8 100644
index 9e96055058..ef3c1260b0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1199,13 +1199,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -44,5 +44,5 @@ index def0db5fea..830f3a89a8 100644
limitedPackets = 0;
return true;
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0135-Configurable-flying-kick-messages.patch
View File

@ -1,14 +1,14 @@
From 6416fe475c2676955813b2ea23fb84ef3a2384ba Mon Sep 17 00:00:00 2001
From 4d4d3ce5358fe23f03ffb70d320b1321c75e8c26 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 20 Sep 2016 00:58:01 +0000
Subject: [PATCH] Configurable flying kick messages
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index b496bc3869..aa0e3c757d 100644
index d78f6516e5..1db8e1f97a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -248,4 +248,11 @@ public class PaperConfig {
@@ -253,4 +253,11 @@ public class PaperConfig {
}
packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
}
@ -21,7 +21,7 @@ index b496bc3869..aa0e3c757d 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 830f3a89a8..77f12b4d1d 100644
index ef3c1260b0..37b3dd6971 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -146,6 +146,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -42,5 +42,5 @@ index 830f3a89a8..77f12b4d1d 100644
}
} else {
--
2.18.0
2.19.0

12
Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
View File

@ -1,4 +1,4 @@
From 4aee3a67204e2cca9bd24f8b891807f57c8d7110 Mon Sep 17 00:00:00 2001
From 9f3cfa798dee82bfecaa93a68036552fd5f28c52 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Sep 2016 23:16:39 -0400
Subject: [PATCH] Auto Save Improvements
@ -12,10 +12,10 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
Adds incremental player auto saving too
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index aa0e3c757d..c1845d6811 100644
index 1db8e1f97a..cf31c4469a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -255,4 +255,15 @@ public class PaperConfig {
@@ -260,4 +260,15 @@ public class PaperConfig {
flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
}
@ -32,7 +32,7 @@ index aa0e3c757d..c1845d6811 100644
+ }
}
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 62268d34d1..2399777c5e 100644
index 0cd15c17e8..c43152f456 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@ -43,7 +43,7 @@ index 62268d34d1..2399777c5e 100644
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -308,4 +309,19 @@ public class PaperWorldConfig {
@@ -310,4 +311,19 @@ public class PaperWorldConfig {
private void skipEntityTickingInChunksScheduledForUnload() {
skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
}
@ -64,7 +64,7 @@ index 62268d34d1..2399777c5e 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 7f1d0b39cf..5285bfb409 100644
index 297ead5a77..ccde5e8e29 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -50,9 +50,9 @@ public class Chunk implements IChunkAccess {

8
Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
View File

@ -1,14 +1,14 @@
From 6d9f312b1a4acc0055a7bebd064fcdf58ea1fdfb Mon Sep 17 00:00:00 2001
From 0b64e86c9b2a49148db5eb96be7824722994b798 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 5 Oct 2016 16:27:36 -0500
Subject: [PATCH] Option to remove corrupt tile entities
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 2399777c5e..d9f5ead011 100644
index c43152f456..0d456bcbac 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -324,4 +324,9 @@ public class PaperWorldConfig {
@@ -326,4 +326,9 @@ public class PaperWorldConfig {
private void maxAutoSaveChunksPerTick() {
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
}
@ -19,7 +19,7 @@ index 2399777c5e..d9f5ead011 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 5285bfb409..ca6107a5af 100644
index ccde5e8e29..fcc0e21d16 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -827,6 +827,12 @@ public class Chunk implements IChunkAccess {

6
Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
View File

@ -1,4 +1,4 @@
From 1b5c32b608dc6896989f14406a9aa111266ad3ab Mon Sep 17 00:00:00 2001
From 4eadcee4a45aaefbec56d8bffb297242c0f54ffd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Nov 2016 21:52:22 -0400
Subject: [PATCH] Prevent Auto Save if Save Queue is full
@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
then avoid processing auto save (which would add more)
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index d9f5ead011..656ecdacaf 100644
index 0d456bcbac..40746c13ef 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -325,6 +325,11 @@ public class PaperWorldConfig {
@@ -327,6 +327,11 @@ public class PaperWorldConfig {
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
}

6
Spigot-Server-Patches/0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
View File

@ -1,11 +1,11 @@
From ac65d6fee722653f8d1d0957bb88b250bb32c4e7 Mon Sep 17 00:00:00 2001
From 5f1d379edbc0a4914ac5165ea714e305b28cfce4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 12 Nov 2016 23:25:22 -0600
Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 656ecdacaf..2c7e6de02f 100644
index 40746c13ef..5e51aef84c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@ -16,7 +16,7 @@ index 656ecdacaf..2c7e6de02f 100644
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -334,4 +335,12 @@ public class PaperWorldConfig {
@@ -336,4 +337,12 @@ public class PaperWorldConfig {
private void removeCorruptTEs() {
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
}

6
Spigot-Server-Patches/0156-Configurable-Cartographer-Treasure-Maps.patch
View File

@ -1,4 +1,4 @@
From 9c805dc40de579fbe3f60f440d851ed2a1f0c95a Mon Sep 17 00:00:00 2001
From 2cac5ee4b1d489f95f107d1575c4a1a8f96ffbda Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:26:27 -0500
Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
which are limited in quantity.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 2c7e6de02f..a2af13185f 100644
index 5e51aef84c..5d152af154 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -343,4 +343,14 @@ public class PaperWorldConfig {
@@ -345,4 +345,14 @@ public class PaperWorldConfig {
Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
}
}

8
Spigot-Server-Patches/0159-Add-option-to-remove-invalid-statistics.patch
View File

@ -1,14 +1,14 @@
From 835919765540d8cdbaca376e1f1ad2e8e23e868e Mon Sep 17 00:00:00 2001
From 5f12d734792a8a72c05ae4e9a20355ad2b7cb72b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 20 Dec 2016 23:09:21 -0600
Subject: [PATCH] Add option to remove invalid statistics
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c1845d6811..9f1182c723 100644
index cf31c4469a..eb1b803c4d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -266,4 +266,13 @@ public class PaperConfig {
@@ -271,4 +271,13 @@ public class PaperConfig {
maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
}
}
@ -43,5 +43,5 @@ index 6405f98e06..42e2f3d22b 100644
this.a.put(statistic, nbttagcompound2.getInt(s2));
}
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0172-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From 09bdf613dd7547fdbd79c1c4b5d5561ed683893f Mon Sep 17 00:00:00 2001
From 4a7eb279f6b957a9194bbe3f658269d749038a92 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jan 2017 18:07:56 -0500
Subject: [PATCH] Cap Entity Collisions
@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
You can set this to 0 to disable collisions.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index a2af13185f..b3a0be0f79 100644
index 5d152af154..02d99aec43 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -353,4 +353,10 @@ public class PaperWorldConfig {
@@ -355,4 +355,10 @@ public class PaperWorldConfig {
log("Treasure Maps will return already discovered locations");
}
}

6
Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
View File

@ -1,4 +1,4 @@
From af37ef1e24c03b7a7dfed40e0611c7c471c9c008 Mon Sep 17 00:00:00 2001
From 86f0ce9af4b1f511ed5fab9611a635fc128e46e1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 16 May 2017 21:29:08 -0500
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
To be converted into a Paper-API event at some point in the future?
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index b3a0be0f79..fe0ee64db1 100644
index 02d99aec43..3507997fc3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -359,4 +359,10 @@ public class PaperWorldConfig {
@@ -361,4 +361,10 @@ public class PaperWorldConfig {
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
log( "Max Entity Collisions: " + maxCollisionsPerEntity );
}

8
Spigot-Server-Patches/0180-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -1,4 +1,4 @@
From d863eb899e336a9558cb482e3e2a312254e8107e Mon Sep 17 00:00:00 2001
From 7068366743806ceade7e865f3f40d8932c9ab510 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:34 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 9f1182c72..e97dbaf8e 100644
index eb1b803c4d..5eca32c341 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -275,4 +275,9 @@ public class PaperConfig {
@@ -280,4 +280,9 @@ public class PaperConfig {
}
removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
}
@ -20,7 +20,7 @@ index 9f1182c72..e97dbaf8e 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 73ab254aa..849dd19dc 100644
index 73ab254aa0..849dd19dc0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2051,5 +2051,10 @@ public final class CraftServer implements Server {

6
Spigot-Server-Patches/0182-provide-a-configurable-option-to-disable-creeper-lin.patch
View File

@ -1,4 +1,4 @@
From 4229fb214aecee17523646559a10f25bf5523e26 Mon Sep 17 00:00:00 2001
From cafd27b8fff95c34fac1d513e88b6012abf64a04 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 11 Jun 2017 21:01:18 +0100
Subject: [PATCH] provide a configurable option to disable creeper lingering
@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index fe0ee64db1..7e5c710e1f 100644
index 3507997fc3..7c2e0ddb77 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -365,4 +365,10 @@ public class PaperWorldConfig {
@@ -367,4 +367,10 @@ public class PaperWorldConfig {
parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
}

8
Spigot-Server-Patches/0203-Allow-specifying-a-custom-authentication-servers-dow.patch
View File

@ -1,4 +1,4 @@
From d85c759a84dfcc06cc74027447ae85e4bb4bf00e Mon Sep 17 00:00:00 2001
From d84d22927da15b875881f73ea5655935c742e33b Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 17 Aug 2017 16:08:20 -0700
Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index e97dbaf8e3..45863c017c 100644
index 5eca32c341..2f3cfd4f0a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -1,5 +1,6 @@
@ -16,7 +16,7 @@ index e97dbaf8e3..45863c017c 100644
import com.google.common.base.Throwables;
import java.io.File;
@@ -280,4 +281,9 @@ public class PaperConfig {
@@ -285,4 +286,9 @@ public class PaperConfig {
private static void suggestPlayersWhenNull() {
suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
}
@ -42,5 +42,5 @@ index 8bbea96240..10c82107d4 100644
LoginListener.c.error("Couldn\'t verify username because servers are unavailable");
}
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0215-Option-for-maximum-exp-value-when-merging-orbs.patch
View File

@ -1,14 +1,14 @@
From 8a8ea6d43ef3a37395e5175bf65dbc6a88e3e712 Mon Sep 17 00:00:00 2001
From 6250668e0ae8f57d79ed8ab867d472112bd5fcdd Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Nov 2017 23:03:12 -0500
Subject: [PATCH] Option for maximum exp value when merging orbs
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7e5c710e1f..35bef53358 100644
index 7c2e0ddb77..7391a4a6a8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -371,4 +371,10 @@ public class PaperWorldConfig {
@@ -373,4 +373,10 @@ public class PaperWorldConfig {
disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
log("Creeper lingering effect: " + disableCreeperLingeringEffect);
}

6
Spigot-Server-Patches/0225-Configurable-Chunks-Sends-per-Tick-setting.patch
View File

@ -1,4 +1,4 @@
From 348dc618eced6c2791c08235138dea937e6ce275 Mon Sep 17 00:00:00 2001
From e88d315dc2ee779aafad735d9fbc02de3022439f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 1 Jan 2018 15:41:59 -0500
Subject: [PATCH] Configurable Chunks Sends per Tick setting
@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
Limit how much exploration lags the server
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 35bef53358..128ec7260a 100644
index 7391a4a6a8..af69342e6c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -377,4 +377,13 @@ public class PaperWorldConfig {
@@ -379,4 +379,13 @@ public class PaperWorldConfig {
expMergeMaxValue = getInt("experience-merge-max-value", -1);
log("Experience Merge Max Value: " + expMergeMaxValue);
}

6
Spigot-Server-Patches/0226-Configurable-Max-Chunk-Gens-per-Tick.patch
View File

@ -1,4 +1,4 @@
From 92cab28ad64ca7a9e872c15de45aaa49778ee048 Mon Sep 17 00:00:00 2001
From 6926ca16ef7d080a1de24ee8a1226862a1d3f791 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 1 Jan 2018 16:10:24 -0500
Subject: [PATCH] Configurable Max Chunk Gens per Tick
@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
lagging, and let larger servers reduce this value according to their own desires.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 128ec7260a..91ae634edd 100644
index af69342e6c..ca7efc9175 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -386,4 +386,15 @@ public class PaperWorldConfig {
@@ -388,4 +388,15 @@ public class PaperWorldConfig {
}
log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
}

6
Spigot-Server-Patches/0227-Make-max-squid-spawn-height-configurable.patch
View File

@ -1,4 +1,4 @@
From d06a6cb5454b47db888922a8bab80350af829225 Mon Sep 17 00:00:00 2001
From 2237c270e021b6b166f77495c0d66ef22d3ca1fa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 11 Jan 2018 16:47:28 -0600
Subject: [PATCH] Make max squid spawn height configurable
@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
whatever
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 91ae634edd..6623a22c3d 100644
index ca7efc9175..67b4d576a9 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -397,4 +397,9 @@ public class PaperWorldConfig {
@@ -399,4 +399,9 @@ public class PaperWorldConfig {
log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
}
}

10
Spigot-Server-Patches/0236-Toggleable-player-crits-helps-mitigate-hacked-client.patch
View File

@ -1,14 +1,14 @@
From 82fab6bbd13fbb89a23009a1f8d5c98cc13d98f0 Mon Sep 17 00:00:00 2001
From f4c3477e8887eb1266030b98bb9fe96f350e00cb Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Sat, 10 Mar 2018 00:50:24 +0100
Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 63f8f566..c9a44863 100644
index 67b4d576a9..02c52958c8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -180,6 +180,11 @@ public class PaperWorldConfig {
@@ -182,6 +182,11 @@ public class PaperWorldConfig {
disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
}
@ -21,7 +21,7 @@ index 63f8f566..c9a44863 100644
private void allChunksAreSlimeChunks() {
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 1b7adbf4..a728507c 100644
index 1b7adbf4ba..a728507c54 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1036,6 +1036,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -33,5 +33,5 @@ index 1b7adbf4..a728507c 100644
if (flag2) {
f *= 1.5F;
--
2.18.0.windows.1
2.19.0

8
Spigot-Server-Patches/0247-Make-player-data-saving-configurable.patch
View File

@ -1,14 +1,14 @@
From 7334becad2b654b234ba959e626462a9e1094e50 Mon Sep 17 00:00:00 2001
From fb98c623a0f21ae1e65cfa621d589aaed5a0e38d Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Mon, 26 Mar 2018 18:30:53 +0300
Subject: [PATCH] Make player data saving configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 45863c017c..9bfbaf61e5 100644
index 2f3cfd4f0a..97a8fb0179 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -286,4 +286,13 @@ public class PaperConfig {
@@ -291,4 +291,13 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() {
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
}
@ -35,5 +35,5 @@ index 0fd6efec0b..7553280d21 100644
NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
File file = new File(this.playerDir, entityhuman.bu() + ".dat.tmp");
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0253-Configurable-sprint-interruption-on-attack.patch
View File

@ -1,4 +1,4 @@
From eb30549acbe531dd8a6bde60f7bc8c83298dbb68 Mon Sep 17 00:00:00 2001
From 999552c8c8404d598b59e7971a400d9daee78010 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sat, 14 Apr 2018 20:20:46 +0200
Subject: [PATCH] Configurable sprint interruption on attack
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
If the sprint interruption is disabled players continue sprinting when they attack entities.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index a0a1435249..eb0f8b0b33 100644
index 02c52958c8..fe56f01035 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -407,4 +407,9 @@ public class PaperWorldConfig {
@@ -409,4 +409,9 @@ public class PaperWorldConfig {
private void squidMaxSpawnHeight() {
squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
}

6
Spigot-Server-Patches/0257-Block-Enderpearl-Travel-Exploit.patch
View File

@ -1,4 +1,4 @@
From f9fd819490c278f5309385e64aed094e3131839a Mon Sep 17 00:00:00 2001
From b4f79801103adfdc249060cff44df623f10d84a8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:15:26 -0400
Subject: [PATCH] Block Enderpearl Travel Exploit
@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
This is mainly useful for survival servers that do not allow freeform teleporting.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index eb0f8b0b33..df6ade40c8 100644
index fe56f01035..af6b97708a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -412,4 +412,10 @@ public class PaperWorldConfig {
@@ -414,4 +414,10 @@ public class PaperWorldConfig {
private void disableSprintInterruptionOnAttack() {
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
}

8
Spigot-Server-Patches/0270-Configurable-Alternative-LootPool-Luck-Formula.patch
View File

@ -1,4 +1,4 @@
From c68f5a2cbfee772cbf26e1634365a13825064573 Mon Sep 17 00:00:00 2001
From 437422d05c2c0b4b5be73a645446885b6eeddbba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 15 Jun 2018 00:30:32 -0400
Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@ -36,10 +36,10 @@ This change will result in some major changes to fishing formulas.
I would love to see this change in Vanilla, so Mojang please pull :)
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 9bfbaf61e5..bcdf4f91d8 100644
index 97a8fb0179..72602be58a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -295,4 +295,12 @@ public class PaperConfig {
@@ -300,4 +300,12 @@ public class PaperConfig {
"such as inventories, experience points, advancements and the like will not be saved when they log out.");
}
}
@ -104,5 +104,5 @@ index 8daccdd6e9..c2a4ed6cf0 100644
public abstract void a(Collection<ItemStack> var1, Random var2, LootTableInfo var3);
--
2.18.0
2.19.0

6
Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch
View File

@ -1,14 +1,14 @@
From 0b94f1c5d92f60e93fbfef7521300409e91882fb Mon Sep 17 00:00:00 2001
From adb49645962ea1ad73a35f7ee0d120f929af05d5 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:18:16 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index df6ade40c8..08e8062c93 100644
index af6b97708a..c0eccc22b7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -418,4 +418,9 @@ public class PaperWorldConfig {
@@ -420,4 +420,9 @@ public class PaperWorldConfig {
disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
}

6
Spigot-Server-Patches/0282-Add-config-to-disable-ender-dragon-legacy-check.patch
View File

@ -1,14 +1,14 @@
From 8223ffb3d66d1778fa4cfb08af6aab35f5784e8a Mon Sep 17 00:00:00 2001
From d7c4de3a1d800bef9dd9fdb6e69599bb48317825 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 22 Jun 2018 10:38:31 -0500
Subject: [PATCH] Add config to disable ender dragon legacy check
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 08e8062c93..e806cc1671 100644
index c0eccc22b7..e5e5d2447d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -423,4 +423,9 @@ public class PaperWorldConfig {
@@ -425,4 +425,9 @@ public class PaperWorldConfig {
private void shieldBlockingDelay() {
shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
}

6
Spigot-Server-Patches/0286-Configurable-Bed-Search-Radius.patch
View File

@ -1,4 +1,4 @@
From 1e525acb30342f5998d0b28a1bc4f32bab9d1f7f Mon Sep 17 00:00:00 2001
From 23183906000064c2de97bdb7c29fc757372770ff Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 15:22:06 -0400
Subject: [PATCH] Configurable Bed Search Radius
@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
Defaults to vanilla 1.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index e806cc1671..acdff6b20a 100644
index e5e5d2447d..99986bac97 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -428,4 +428,15 @@ public class PaperWorldConfig {
@@ -430,4 +430,15 @@ public class PaperWorldConfig {
private void scanForLegacyEnderDragon() {
scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
}

8
Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
View File

@ -1,4 +1,4 @@
From 935ccef81ea9265bec68c0730db6730835cdf8ec Mon Sep 17 00:00:00 2001
From a18e6adce72a0abc1cf6d290a75a10e6409cf00c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index acdff6b20a..abd60fe844 100644
index 99986bac97..1bfa9ad567 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -439,4 +439,47 @@ public class PaperWorldConfig {
@@ -441,4 +441,47 @@ public class PaperWorldConfig {
log("Bed Search Radius: " + bedSearchRadius);
}
}
@ -85,7 +85,7 @@ index acdff6b20a..abd60fe844 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 0dab65c870..91049ed20f 100644
index 83e9c97873..518e246569 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,10 @@

6
Spigot-Server-Patches/0304-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -1,14 +1,14 @@
From 4e29f3f5698d19db99f0269c5cc0818ab01efcd0 Mon Sep 17 00:00:00 2001
From 4708d049575f974711c0a89dac7fd5d9d09e2b7f Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
Date: Mon, 23 Jul 2018 12:57:39 +0200
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index abd60fe844..01bad73690 100644
index 1bfa9ad567..4a89d8bedb 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -359,6 +359,11 @@ public class PaperWorldConfig {
@@ -361,6 +361,11 @@ public class PaperWorldConfig {
}
}

8
Spigot-Server-Patches/0316-Provide-option-to-use-a-versioned-world-folder-for-t.patch
View File

@ -1,4 +1,4 @@
From bcd7f6ca976d597f8e3b96d581608a071ca24440 Mon Sep 17 00:00:00 2001
From 5696f5658ba8b4da0887128327f22533fe32fc47 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 15:48:50 -0400
Subject: [PATCH] Provide option to use a versioned world folder for testing
@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
This is highly experiemental so backup your world before relying on this to not modify it
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index bcdf4f91d8..c457d07110 100644
index 72602be58a..85b74994aa 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -13,6 +13,7 @@ import java.util.List;
@ -30,7 +30,7 @@ index bcdf4f91d8..c457d07110 100644
import java.util.regex.Pattern;
import com.google.common.collect.Lists;
@@ -303,4 +304,27 @@ public class PaperConfig {
@@ -308,4 +309,27 @@ public class PaperConfig {
Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
}
}
@ -225,5 +225,5 @@ index ab085788ab..c84e6acdbe 100644
this.baseDir.mkdirs();
this.playerDir = new File(this.baseDir, "playerdata");
--
2.18.0
2.19.0

10
Spigot-Server-Patches/0322-Break-up-and-make-tab-spam-limits-configurable.patch
View File

@ -1,4 +1,4 @@
From 1169fa2305448868735666a735f52deda6682715 Mon Sep 17 00:00:00 2001
From dd280bda23d6e9be15ab2f08c95a5520fe2d876b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 29 Jul 2018 05:02:15 +0100
Subject: [PATCH] Break up and make tab spam limits configurable
@ -22,10 +22,10 @@ to take the burden of this into their own hand without having to rely on
plugins doing unsafe things.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c457d0711..cc2e4ad3b 100644
index 85b74994aa..f74148b8a3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -327,4 +327,18 @@ public class PaperConfig {
@@ -332,4 +332,18 @@ public class PaperConfig {
logger.log(Level.INFO, "******************************************************");
}
}
@ -45,7 +45,7 @@ index c457d0711..cc2e4ad3b 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f8ffc5832..452c27970 100644
index f8ffc58326..452c279708 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -78,6 +78,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -74,5 +74,5 @@ index f8ffc5832..452c27970 100644
return;
}
--
2.16.1.windows.1
2.19.0

6
Spigot-Server-Patches/0328-Add-Early-Warning-Feature-to-WatchDog.patch
View File

@ -1,4 +1,4 @@
From 8f69fa82dcee69d86893451d8eaec5bf90b7c6ee Mon Sep 17 00:00:00 2001
From b76e219243a1d9ebd0c6c4100299dc176319d70e Mon Sep 17 00:00:00 2001
From: miclebrick <miclebrick@outlook.com>
Date: Wed, 8 Aug 2018 15:30:52 -0400
Subject: [PATCH] Add Early Warning Feature to WatchDog
@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
This will help diagnose what was going on in that time before the crash.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cc2e4ad3bd..54f088c242 100644
index f74148b8a3..2a0ce06212 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -24,6 +24,8 @@ import org.bukkit.configuration.InvalidConfigurationException;
@ -21,7 +21,7 @@ index cc2e4ad3bd..54f088c242 100644
public class PaperConfig {
@@ -328,6 +330,14 @@ public class PaperConfig {
@@ -333,6 +335,14 @@ public class PaperConfig {
}
}

6
Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch
View File

@ -1,14 +1,14 @@
From 93d9a4f971a874f29871435fb5f1d7e8828a518e Mon Sep 17 00:00:00 2001
From cb2191edaefcdf7ba434fd69ddb5ac89c7da746d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:09 -0700
Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 01bad73690..65108dd3a4 100644
index 4a89d8bedb..b412d02ada 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -487,4 +487,10 @@ public class PaperWorldConfig {
@@ -489,4 +489,10 @@ public class PaperWorldConfig {
break;
}
}

6
Spigot-Server-Patches/0340-Optimize-Hoppers.patch
View File

@ -1,4 +1,4 @@
From 127dec9a00377cd18abfa142fce02f0390c7189e Mon Sep 17 00:00:00 2001
From ff79abe5d00ee2187b3c32043b88383781c5fadc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Optimize Hoppers
@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 65108dd3a4..7b479cb019 100644
index b412d02ada..cfeba61a32 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -413,6 +413,15 @@ public class PaperWorldConfig {
@@ -415,6 +415,15 @@ public class PaperWorldConfig {
squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
}

8
Spigot-Server-Patches/0346-Anti-Xray.patch
View File

@ -1,11 +1,11 @@
From 66769dc5c9551799bdaae670be7a5a76757aad76 Mon Sep 17 00:00:00 2001
From edb9656cd2a362687134128b3b3089f491397da8 Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 7b479cb019..b6542fec41 100644
index cfeba61a32..fec0a7cc36 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -1,7 +1,10 @@
@ -19,7 +19,7 @@ index 7b479cb019..b6542fec41 100644
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -502,4 +505,27 @@ public class PaperWorldConfig {
@@ -504,4 +507,27 @@ public class PaperWorldConfig {
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
}
@ -1049,7 +1049,7 @@ index 0000000000..37093419cf
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 4a39461eb2..3a22e69d99 100644
index c6f86e8575..f5e1a26172 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -535,7 +535,7 @@ public class Chunk implements IChunkAccess {

6
Spigot-Server-Patches/0347-Configurable-speed-for-water-flowing-over-lava.patch
View File

@ -1,14 +1,14 @@
From d126a579b60542ea3c1d4404087c49f071f61d67 Mon Sep 17 00:00:00 2001
From 879a9910181dcfd5df3bcaa879b7cb9c010b3666 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 8 Aug 2018 16:33:21 -0600
Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index b6542fec41..4964607cbc 100644
index fec0a7cc36..4b4223a9fa 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -457,6 +457,12 @@ public class PaperWorldConfig {
@@ -459,6 +459,12 @@ public class PaperWorldConfig {
}
}

12
Spigot-Server-Patches/0375-Support-Overriding-World-Seeds.patch
View File

@ -1,4 +1,4 @@
From 58b6672e3647e556c7dab27328f467e3ab5844f6 Mon Sep 17 00:00:00 2001
From 6731262f46ea6ab3249a8cb4a2ce8338d23185e0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 17 Sep 2018 23:05:31 -0400
Subject: [PATCH] Support Overriding World Seeds
@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
a permanent change in that it won't go back if you remove it from paper.yml
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 54f088c24..4093fbeb6 100644
index 2a0ce06212..fca18fbb81 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@ -34,7 +34,7 @@ index 54f088c24..4093fbeb6 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import co.aikar.timings.Timings;
@@ -351,4 +353,23 @@ public class PaperConfig {
@@ -356,4 +358,23 @@ public class PaperConfig {
}
tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
}
@ -59,7 +59,7 @@ index 54f088c24..4093fbeb6 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 81cda5df5..fb6232031 100644
index 81cda5df56..fb62320310 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -350,7 +350,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -72,7 +72,7 @@ index 81cda5df5..fb6232031 100644
if (j == 0) {
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
index a98bc4d0e..c108b97b9 100644
index a98bc4d0e1..c108b97b9b 100644
--- a/src/main/java/net/minecraft/server/WorldData.java
+++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -110,7 +110,7 @@ public class WorldData {
@ -85,7 +85,7 @@ index a98bc4d0e..c108b97b9 100644
String s = nbttagcompound.getString("generatorName");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 04a76802b..23663ede9 100644
index 04a76802b8..23663ede9f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -982,7 +982,7 @@ public final class CraftServer implements Server {