core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0360-Fix-sign-edit-memory-l...

48 lines
2.3 KiB
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 02:27:40 +00:00
From 796f4f452a911215ff597a63f905aced025a0666 Mon Sep 17 00:00:00 2001
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
From: Aikar <aikar@aikar.co>
Date: Thu, 28 Feb 2019 00:15:28 -0500
Subject: [PATCH] Fix sign edit memory leak
when a player edits a sign, a reference to their Entity is never cleand up.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
Fix tabcomplete firing off-main Also rebuild patches
2019-06-03 02:19:44 +00:00
index 9b895269a5..ec4b693730 100644
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
Fix tabcomplete firing off-main Also rebuild patches
2019-06-03 02:19:44 +00:00
@@ -2567,7 +2567,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
TileEntitySign tileentitysign = (TileEntitySign) tileentity;
Update to 1.14.2
2019-05-27 23:01:45 +00:00
- if (!tileentitysign.d() || tileentitysign.f() != this.player) {
+ if (!tileentitysign.d() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) {
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
this.minecraftServer.warning("Player " + this.player.getDisplayName().getString() + " just tried to change non-editable sign");
this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
return;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
Fix tabcomplete firing off-main Also rebuild patches
2019-06-03 02:19:44 +00:00
index 15b3add9ed..caeaca4c7a 100644
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
@@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
Remove outbound string length limits on signs, improve codepoint logic now 80 chars counts multi sized code points the same so 80 chinese characters would be allowed too. Removed outbound limit as it doesn't solve the chunk oversize problem. proper fix for chunk sending in another patch next.
2019-03-02 20:28:04 +00:00
// Paper start - Strip invalid unicode from signs on load
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it
private boolean privateUnicodeRemoved = false;
+ public java.util.UUID signEditor;
// Paper end
public TileEntitySign() {
MC 1.14.1
2019-05-14 02:20:58 +00:00
@@ -141,7 +142,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
}
public void a(EntityHuman entityhuman) {
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
- this.j = entityhuman;
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
+ // Paper start
+ //this.g = entityhuman;
+ signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
+ // Paper end
}
Update to 1.14.2
2019-05-27 23:01:45 +00:00
public EntityHuman f() {
Fix a sign memory leak
2019-02-28 05:47:57 +00:00
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
2.21.0
Fix a sign memory leak
2019-02-28 05:47:57 +00:00