Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-05 02:10:30 +01:00
Code Issues Projects Releases Wiki Activity

Remove patches that got added back in merge

Browse Source 
Fix build
This commit is contained in:
Zach Brown 2018-04-22 15:29:03 -04:00
parent 3340e81425
commit 2120696fcf
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0290-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
View File

@ -1,4 +1,4 @@
From 21f33d68a9d7e7836c15002ba8e08beef5dbad7a Mon Sep 17 00:00:00 2001
From 81ae8d6dcf6c9f936583ba0c8fa5577c538d2f18 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Apr 2018 11:21:48 -0400
Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
@ -7,10 +7,10 @@ This disables the behavior that allows players to keep chunks permanently loaded
by default and allows server operators to enable it if they wish.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index c903c89cf..e1ed267a2 100644
index 9ef2b1635..cc1914d8c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -500,4 +500,10 @@ public class PaperWorldConfig {
@@ -502,4 +502,10 @@ public class PaperWorldConfig {
private void disableSprintInterruptionOnAttack() {
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
}
@ -35,5 +35,5 @@ index 55dada668..0eba3df57 100644
if (this.chunkLoader instanceof ChunkRegionLoader) {
--
2.17.0
2.14.3

28
Spigot-Server-Patches/0290-Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch
View File

@ -1,28 +0,0 @@
From 01a1624d8cb426581578ee90eac92d988cc9d19f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 18 Apr 2018 01:42:42 -0400
Subject: [PATCH] Revert SPIGOT-3894 to restore vanilla behavior
reporter of this issue was incorrect and did not verify vanilla logic
vanilla logic only skips ticks if the flag is set
spigots change causes bugs as it now skips ticking and processing
chunk teleportation, which was a bug I fixed many many years ago...
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4ce846b5..6c92f93a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1754,7 +1754,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit end
// Spigot start
- if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
+ if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - Revert spigot change back to vanilla
entity.ticksLived++;
entity.inactiveTick();
return;
--
2.14.1.windows.1

25
Spigot-Server-Patches/0291-revert-Better-reloading-of-pending-unload-chunks.patch
View File

@ -1,25 +0,0 @@
From f731aff707b73a5aa7336f8dfbef087bf5668ef1 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 8 Apr 2018 01:21:23 +0100
Subject: [PATCH] revert "Better reloading of pending unload chunks"
many areas of NMS calls through to this method which means that
the server can easilly keep chunks loaded in certain conditions
even when they're no longer needed.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 55dada66..2ed3fc40 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -148,7 +148,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) {
- Chunk chunk = getLoadedChunkAt(i, j);
+ Chunk chunk = getChunkIfLoaded(i, j); // Paper - revert "Better reloading of pending unload chunks" (see patch)
ChunkRegionLoader loader = null;
if (this.chunkLoader instanceof ChunkRegionLoader) {
--
2.14.1.windows.1