mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-04 10:11:29 +01:00
Remove patches that got added back in merge
Fix build
This commit is contained in:
parent
e2b2332062
commit
4e4f7912da
3 changed files with 1 additions and 50 deletions
|
@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
|
||||||
by default and allows server operators to enable it if they wish.
|
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
|
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
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
|
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 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
|
|
||||||
@@ -0,0 +0,0 @@ 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;
|
|
||||||
--
|
|
|
@ -1,23 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 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
|
|
||||||
@@ -0,0 +0,0 @@ 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) {
|
|
||||||
--
|
|
Loading…
Reference in a new issue