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

If we remove a corrupt TE, ensure we save the chunk

This commit is contained in:
Aikar 2018-06-15 00:11:39 -04:00
parent ea8801ce28
commit 1127a49ced
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
View File

@ -1,11 +1,11 @@
From 3fdbbb11811a42cff05d2e2af46c201b72063ba9 Mon Sep 17 00:00:00 2001
From 734677730dce1c483404b77ae0d2d9f902dc4f1f 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 f3c0bbde..f30e36f3 100644
index ce848d63e..93b0af036 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -379,4 +379,9 @@ public class PaperWorldConfig {
@ -19,16 +19,17 @@ index f3c0bbde..f30e36f3 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 87730aec..1d056031 100644
index 87730aec3..ce76a0e5d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -786,11 +786,17 @@ public class Chunk {
@@ -786,11 +786,18 @@ public class Chunk {
"Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16));
e.printStackTrace();
ServerInternalException.reportInternalException(e);
+
+ if (this.world.paperConfig.removeCorruptTEs) {
+ this.removeTileEntity(tileentity.getPosition());
+ this.markDirty();
+ org.bukkit.Bukkit.getLogger().info("Removing corrupt tile entity");
+ }
// Paper end
@ -41,5 +42,5 @@ index 87730aec..1d056031 100644
if (this.j) {
TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
--
2.17.0
2.17.1

6
Spigot-Server-Patches/0252-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
View File

@ -1,4 +1,4 @@
From bb881bebce0630ef0b89924c4440fc0a38a3df35 Mon Sep 17 00:00:00 2001
From 8c155ab653d16ddc8cf6850af419983467abf449 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 18 Dec 2017 07:26:56 +0000
Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are
@ -18,7 +18,7 @@ only send chunks which are actually ready to be sent, otherwise, we
will always send chunks.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index d1066d82e..b3ee62a4e 100644
index aecfa331d..7cd537a59 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -39,7 +39,7 @@ public class Chunk {
@ -30,7 +30,7 @@ index d1066d82e..b3ee62a4e 100644
private boolean s;
private boolean t;
private long lastSaved;
@@ -1136,7 +1136,11 @@ public class Chunk {
@@ -1137,7 +1137,11 @@ public class Chunk {
* We cannot unfortunately do this lighting stage during chunk gen as it appears to put a lot more noticeable load on the server, than when it is done at play time.
* For now at least we will simply send all chunks, in accordance with pre 1.7 behaviour.
*/