From 37d9d9643fd1c97f4a0aabdea3f6fb1ac1fcdf0b Mon Sep 17 00:00:00 2001 From: Etil <81570777+etil2jz@users.noreply.github.com> Date: Mon, 18 Oct 2021 00:16:51 +0200 Subject: [PATCH] Drop `Fix merchant inventory not closing on entity removal` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patched in Paper, upstream coming soon™ --- ...entory-not-closing-on-entity-removal.patch | 22 ------------------- ...Purpur-Disable-outdated-build-check.patch} | 0 ...ed-server-showing-in-ping-before-se.patch} | 0 ...r-Don-t-send-useless-entity-packets.patch} | 0 ...Skip-events-if-there-s-no-listeners.patch} | 0 ...pur-Fix-the-dead-lagging-the-server.patch} | 0 ...rpur-Alternative-Keepalive-Handling.patch} | 0 ...settings-suppressing-pointless-logs.patch} | 0 ...pur-Add-5-second-tps-average-in-tps.patch} | 0 ...> 0059-Patina-Remove-VersionFetcher.patch} | 0 ...=> 0060-Purpur-Fix-stuck-in-portals.patch} | 0 ...hange-defaults-in-YAML-config-files.patch} | 0 ...top-squids-floating-on-top-of-water.patch} | 0 ...ities-can-use-portals-configuration.patch} | 0 ...atch => 0064-Lithium-CompactSineLUT.patch} | 0 ...=> 0065-Fix-bees-aging-inside-hives.patch} | 0 ...h => 0066-Fix-entity.fast_retrieval.patch} | 0 ...und-for-Client-Lag-Spikes-MC-162253.patch} | 0 ...ent-updates-if-only-durability-chan.patch} | 0 ...ackets-if-player-has-Fire-Resistanc.patch} | 0 ...70-Packet-obfuscation-and-reduction.patch} | 0 ...atch => 0071-Smooth-world-teleports.patch} | 0 22 files changed, 22 deletions(-) delete mode 100644 patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename patches/server/{0052-Purpur-Disable-outdated-build-check.patch => 0051-Purpur-Disable-outdated-build-check.patch} (100%) rename patches/server/{0053-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch => 0052-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch} (100%) rename patches/server/{0054-Purpur-Don-t-send-useless-entity-packets.patch => 0053-Purpur-Don-t-send-useless-entity-packets.patch} (100%) rename patches/server/{0055-Purpur-Skip-events-if-there-s-no-listeners.patch => 0054-Purpur-Skip-events-if-there-s-no-listeners.patch} (100%) rename patches/server/{0056-Purpur-Fix-the-dead-lagging-the-server.patch => 0055-Purpur-Fix-the-dead-lagging-the-server.patch} (100%) rename patches/server/{0057-Purpur-Alternative-Keepalive-Handling.patch => 0056-Purpur-Alternative-Keepalive-Handling.patch} (100%) rename patches/server/{0058-Purpur-Logger-settings-suppressing-pointless-logs.patch => 0057-Purpur-Logger-settings-suppressing-pointless-logs.patch} (100%) rename patches/server/{0059-Purpur-Add-5-second-tps-average-in-tps.patch => 0058-Purpur-Add-5-second-tps-average-in-tps.patch} (100%) rename patches/server/{0060-Patina-Remove-VersionFetcher.patch => 0059-Patina-Remove-VersionFetcher.patch} (100%) rename patches/server/{0061-Purpur-Fix-stuck-in-portals.patch => 0060-Purpur-Fix-stuck-in-portals.patch} (100%) rename patches/server/{0062-Change-defaults-in-YAML-config-files.patch => 0061-Change-defaults-in-YAML-config-files.patch} (100%) rename patches/server/{0063-Purpur-Stop-squids-floating-on-top-of-water.patch => 0062-Purpur-Stop-squids-floating-on-top-of-water.patch} (100%) rename patches/server/{0064-Purpur-Entities-can-use-portals-configuration.patch => 0063-Purpur-Entities-can-use-portals-configuration.patch} (100%) rename patches/server/{0065-Lithium-CompactSineLUT.patch => 0064-Lithium-CompactSineLUT.patch} (100%) rename patches/server/{0066-Fix-bees-aging-inside-hives.patch => 0065-Fix-bees-aging-inside-hives.patch} (100%) rename patches/server/{0067-Fix-entity.fast_retrieval.patch => 0066-Fix-entity.fast_retrieval.patch} (100%) rename patches/server/{0068-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0067-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%) rename patches/server/{0069-Don-t-send-equipment-updates-if-only-durability-chan.patch => 0068-Don-t-send-equipment-updates-if-only-durability-chan.patch} (100%) rename patches/server/{0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch => 0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch} (100%) rename patches/server/{0071-Packet-obfuscation-and-reduction.patch => 0070-Packet-obfuscation-and-reduction.patch} (100%) rename patches/server/{0072-Smooth-world-teleports.patch => 0071-Smooth-world-teleports.patch} (100%) diff --git a/patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch deleted file mode 100644 index d02450b..0000000 --- a/patches/server/0051-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Etil <81570777+etil2jz@users.noreply.github.com> -Date: Sun, 26 Sep 2021 13:11:10 +0200 -Subject: [PATCH] Fix merchant inventory not closing on entity removal - - -diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 86b6d4b4984c7dc41026bffb695fe9e573c48891..47a086bf030ed21d731dde689bd7e1b005b5df47 100644 ---- a/src/main/java/net/minecraft/server/level/ServerLevel.java -+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2436,6 +2436,11 @@ public class ServerLevel extends Level implements WorldGenLevel { - // Spigot end - // Spigot Start - if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder) { -+ // Mirai start -+ if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { -+ merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); -+ } -+ // Mirai end - for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) { - h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - } diff --git a/patches/server/0052-Purpur-Disable-outdated-build-check.patch b/patches/server/0051-Purpur-Disable-outdated-build-check.patch similarity index 100% rename from patches/server/0052-Purpur-Disable-outdated-build-check.patch rename to patches/server/0051-Purpur-Disable-outdated-build-check.patch diff --git a/patches/server/0053-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch b/patches/server/0052-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch similarity index 100% rename from patches/server/0053-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch rename to patches/server/0052-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch diff --git a/patches/server/0054-Purpur-Don-t-send-useless-entity-packets.patch b/patches/server/0053-Purpur-Don-t-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0054-Purpur-Don-t-send-useless-entity-packets.patch rename to patches/server/0053-Purpur-Don-t-send-useless-entity-packets.patch diff --git a/patches/server/0055-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Purpur-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0055-Purpur-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0054-Purpur-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0056-Purpur-Fix-the-dead-lagging-the-server.patch b/patches/server/0055-Purpur-Fix-the-dead-lagging-the-server.patch similarity index 100% rename from patches/server/0056-Purpur-Fix-the-dead-lagging-the-server.patch rename to patches/server/0055-Purpur-Fix-the-dead-lagging-the-server.patch diff --git a/patches/server/0057-Purpur-Alternative-Keepalive-Handling.patch b/patches/server/0056-Purpur-Alternative-Keepalive-Handling.patch similarity index 100% rename from patches/server/0057-Purpur-Alternative-Keepalive-Handling.patch rename to patches/server/0056-Purpur-Alternative-Keepalive-Handling.patch diff --git a/patches/server/0058-Purpur-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0057-Purpur-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0058-Purpur-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0057-Purpur-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0059-Purpur-Add-5-second-tps-average-in-tps.patch b/patches/server/0058-Purpur-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0059-Purpur-Add-5-second-tps-average-in-tps.patch rename to patches/server/0058-Purpur-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0060-Patina-Remove-VersionFetcher.patch b/patches/server/0059-Patina-Remove-VersionFetcher.patch similarity index 100% rename from patches/server/0060-Patina-Remove-VersionFetcher.patch rename to patches/server/0059-Patina-Remove-VersionFetcher.patch diff --git a/patches/server/0061-Purpur-Fix-stuck-in-portals.patch b/patches/server/0060-Purpur-Fix-stuck-in-portals.patch similarity index 100% rename from patches/server/0061-Purpur-Fix-stuck-in-portals.patch rename to patches/server/0060-Purpur-Fix-stuck-in-portals.patch diff --git a/patches/server/0062-Change-defaults-in-YAML-config-files.patch b/patches/server/0061-Change-defaults-in-YAML-config-files.patch similarity index 100% rename from patches/server/0062-Change-defaults-in-YAML-config-files.patch rename to patches/server/0061-Change-defaults-in-YAML-config-files.patch diff --git a/patches/server/0063-Purpur-Stop-squids-floating-on-top-of-water.patch b/patches/server/0062-Purpur-Stop-squids-floating-on-top-of-water.patch similarity index 100% rename from patches/server/0063-Purpur-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0062-Purpur-Stop-squids-floating-on-top-of-water.patch diff --git a/patches/server/0064-Purpur-Entities-can-use-portals-configuration.patch b/patches/server/0063-Purpur-Entities-can-use-portals-configuration.patch similarity index 100% rename from patches/server/0064-Purpur-Entities-can-use-portals-configuration.patch rename to patches/server/0063-Purpur-Entities-can-use-portals-configuration.patch diff --git a/patches/server/0065-Lithium-CompactSineLUT.patch b/patches/server/0064-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0065-Lithium-CompactSineLUT.patch rename to patches/server/0064-Lithium-CompactSineLUT.patch diff --git a/patches/server/0066-Fix-bees-aging-inside-hives.patch b/patches/server/0065-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0066-Fix-bees-aging-inside-hives.patch rename to patches/server/0065-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0067-Fix-entity.fast_retrieval.patch b/patches/server/0066-Fix-entity.fast_retrieval.patch similarity index 100% rename from patches/server/0067-Fix-entity.fast_retrieval.patch rename to patches/server/0066-Fix-entity.fast_retrieval.patch diff --git a/patches/server/0068-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/patches/server/0067-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch similarity index 100% rename from patches/server/0068-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch rename to patches/server/0067-Paper-PR-Workaround-for-Client-Lag-Spikes-MC-162253.patch diff --git a/patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch b/patches/server/0068-Don-t-send-equipment-updates-if-only-durability-chan.patch similarity index 100% rename from patches/server/0069-Don-t-send-equipment-updates-if-only-durability-chan.patch rename to patches/server/0068-Don-t-send-equipment-updates-if-only-durability-chan.patch diff --git a/patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch similarity index 100% rename from patches/server/0070-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch rename to patches/server/0069-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch diff --git a/patches/server/0071-Packet-obfuscation-and-reduction.patch b/patches/server/0070-Packet-obfuscation-and-reduction.patch similarity index 100% rename from patches/server/0071-Packet-obfuscation-and-reduction.patch rename to patches/server/0070-Packet-obfuscation-and-reduction.patch diff --git a/patches/server/0072-Smooth-world-teleports.patch b/patches/server/0071-Smooth-world-teleports.patch similarity index 100% rename from patches/server/0072-Smooth-world-teleports.patch rename to patches/server/0071-Smooth-world-teleports.patch