From b5bded95f86e0e20be08e2302771527d8b344c52 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 23 Jun 2020 16:39:42 +0200 Subject: [PATCH] Remove more EMC patches --- ...atch => 0017-EMC-PlayerUseItemEvent.patch} | 2 +- patches/api/0017-EMC-SendSignEvent.patch | 64 ------------- ... 0018-EMC-EntityAttackedEntityEvent.patch} | 2 +- ...> 0019-EMC-BlazeLaunchFireballEvent.patch} | 2 +- ...atch => 0020-EMC-Human-getAttackPct.patch} | 2 +- ...C-SpawnEggMeta-setSpawnedEntity-API.patch} | 2 +- ... 0022-EMC-Add-ConduitNewTargetEvent.patch} | 2 +- ...-EMC-Add-a-PlayerThrowTrident-event.patch} | 2 +- ...-EMC-Add-a-BlockHarvestBeehiveEvent.patch} | 2 +- ...t.patch => 0025-Kill-AnnotationTest.patch} | 2 +- ... => 0026-Add-GameProfileLookupEvent.patch} | 2 +- ...patch => 0027-Add-getLastTickMs-api.patch} | 2 +- ...0028-Add-NBT-API-as-first-class-lib.patch} | 2 +- ...h => 0029-EMC-Add-ChatColor.getById.patch} | 2 +- patches/server/0018-EMC-SendSignEvent.patch | 96 ------------------- ...patch => 0018-EMC-ServerReloadEvent.patch} | 2 +- ... 0019-EMC-SnowmanThrowSnowballEvent.patch} | 2 +- ...eset-Ender-Crystals-on-Dragon-Spawn.patch} | 2 +- ... 0021-EMC-EntityAttackedEntityEvent.patch} | 2 +- ...atch => 0022-EMC-Human-getAttackPct.patch} | 2 +- ....patch => 0023-EMC-Tweak-Explosions.patch} | 2 +- ...C-SpawnEggMeta-setSpawnedEntity-API.patch} | 2 +- ...getEvent-and-remove-target-for-canc.patch} | 2 +- ...t.createInventory-with-type-LECTERN.patch} | 2 +- ...EMC-Add-the-PlayerThrowTridentEvent.patch} | 2 +- ...MC-Add-the-BlockHarvestBeehiveEvent.patch} | 2 +- ...ed-server-showing-in-ping-before-se.patch} | 2 +- ...030-Don-t-save-Fireworks-and-Arrows.patch} | 2 +- ... => 0031-Add-GameProfileLookupEvent.patch} | 2 +- ...patch => 0032-Add-getLastTickMs-api.patch} | 2 +- ...ig-yapfa-command-and-basic-settings.patch} | 2 +- ... 0034-Kill-the-vanilla-GameProfiler.patch} | 2 +- ...e.patch => 0035-Remove-Stream-usage.patch} | 2 +- ...ly-players-to-have-collisions-with-.patch} | 2 +- ...low-to-change-the-piston-push-limit.patch} | 2 +- ...0038-Add-NBT-API-as-first-class-lib.patch} | 2 +- ... => 0039-Player-saving-async-FileIO.patch} | 2 +- ...-method-to-call-itself-more-than-on.patch} | 2 +- ...le-I-O-operation-on-load-player-fil.patch} | 2 +- ...=> 0042-Akarin-Save-json-list-async.patch} | 2 +- ...mize-door-interact-with-pathfinding.patch} | 2 +- ...Fix-Always-increment-arrow-despawn-.patch} | 2 +- ...Skip-events-if-there-s-no-listeners.patch} | 2 +- ...0046-Purpur-Add-more-timings-timers.patch} | 2 +- ...atch => 0047-Modify-default-configs.patch} | 2 +- ...atch => 0048-lithium-MixinDirection.patch} | 2 +- ...nBox.patch => 0049-lithium-MixinBox.patch} | 2 +- ...s.patch => 0050-lithium-enum_values.patch} | 2 +- ...051-lithium-MixinAxisCycleDirection.patch} | 2 +- ...h => 0052-lithium-MixinGoalSelector.patch} | 2 +- ...0053-lithium-MixinLandPathNodeMaker.patch} | 2 +- ...me.patch => 0054-lithium-MixinBiome.patch} | 2 +- ...055-lithium-MixinTypeFilterableList.patch} | 2 +- ...tch => 0056-Item-stuck-sleep-config.patch} | 2 +- ...> 0057-Option-for-simpler-Villagers.patch} | 2 +- 55 files changed, 53 insertions(+), 213 deletions(-) rename patches/api/{0018-EMC-PlayerUseItemEvent.patch => 0017-EMC-PlayerUseItemEvent.patch} (99%) delete mode 100644 patches/api/0017-EMC-SendSignEvent.patch rename patches/api/{0019-EMC-EntityAttackedEntityEvent.patch => 0018-EMC-EntityAttackedEntityEvent.patch} (99%) rename patches/api/{0020-EMC-BlazeLaunchFireballEvent.patch => 0019-EMC-BlazeLaunchFireballEvent.patch} (97%) rename patches/api/{0021-EMC-Human-getAttackPct.patch => 0020-EMC-Human-getAttackPct.patch} (91%) rename patches/api/{0022-EMC-SpawnEggMeta-setSpawnedEntity-API.patch => 0021-EMC-SpawnEggMeta-setSpawnedEntity-API.patch} (97%) rename patches/api/{0023-EMC-Add-ConduitNewTargetEvent.patch => 0022-EMC-Add-ConduitNewTargetEvent.patch} (96%) rename patches/api/{0024-EMC-Add-a-PlayerThrowTrident-event.patch => 0023-EMC-Add-a-PlayerThrowTrident-event.patch} (96%) rename patches/api/{0025-EMC-Add-a-BlockHarvestBeehiveEvent.patch => 0024-EMC-Add-a-BlockHarvestBeehiveEvent.patch} (97%) rename patches/api/{0026-Kill-AnnotationTest.patch => 0025-Kill-AnnotationTest.patch} (99%) rename patches/api/{0027-Add-GameProfileLookupEvent.patch => 0026-Add-GameProfileLookupEvent.patch} (97%) rename patches/api/{0028-Add-getLastTickMs-api.patch => 0027-Add-getLastTickMs-api.patch} (95%) rename patches/api/{0029-Add-NBT-API-as-first-class-lib.patch => 0028-Add-NBT-API-as-first-class-lib.patch} (98%) rename patches/api/{0030-EMC-Add-ChatColor.getById.patch => 0029-EMC-Add-ChatColor.getById.patch} (95%) delete mode 100644 patches/server/0018-EMC-SendSignEvent.patch rename patches/server/{0019-EMC-ServerReloadEvent.patch => 0018-EMC-ServerReloadEvent.patch} (94%) rename patches/server/{0020-EMC-SnowmanThrowSnowballEvent.patch => 0019-EMC-SnowmanThrowSnowballEvent.patch} (97%) rename patches/server/{0021-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0020-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (94%) rename patches/server/{0022-EMC-EntityAttackedEntityEvent.patch => 0021-EMC-EntityAttackedEntityEvent.patch} (95%) rename patches/server/{0023-EMC-Human-getAttackPct.patch => 0022-EMC-Human-getAttackPct.patch} (96%) rename patches/server/{0024-EMC-Tweak-Explosions.patch => 0023-EMC-Tweak-Explosions.patch} (97%) rename patches/server/{0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch => 0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch} (97%) rename patches/server/{0026-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch => 0025-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch} (97%) rename patches/server/{0027-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch => 0026-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch} (99%) rename patches/server/{0028-EMC-Add-the-PlayerThrowTridentEvent.patch => 0027-EMC-Add-the-PlayerThrowTridentEvent.patch} (95%) rename patches/server/{0029-EMC-Add-the-BlockHarvestBeehiveEvent.patch => 0028-EMC-Add-the-BlockHarvestBeehiveEvent.patch} (96%) rename patches/server/{0030-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch => 0029-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch} (94%) rename patches/server/{0031-Don-t-save-Fireworks-and-Arrows.patch => 0030-Don-t-save-Fireworks-and-Arrows.patch} (93%) rename patches/server/{0032-Add-GameProfileLookupEvent.patch => 0031-Add-GameProfileLookupEvent.patch} (98%) rename patches/server/{0033-Add-getLastTickMs-api.patch => 0032-Add-getLastTickMs-api.patch} (98%) rename patches/server/{0034-Add-config-yapfa-command-and-basic-settings.patch => 0033-Add-config-yapfa-command-and-basic-settings.patch} (99%) rename patches/server/{0035-Kill-the-vanilla-GameProfiler.patch => 0034-Kill-the-vanilla-GameProfiler.patch} (97%) rename patches/server/{0036-Remove-Stream-usage.patch => 0035-Remove-Stream-usage.patch} (99%) rename patches/server/{0037-Add-option-for-only-players-to-have-collisions-with-.patch => 0036-Add-option-for-only-players-to-have-collisions-with-.patch} (98%) rename patches/server/{0038-Allow-to-change-the-piston-push-limit.patch => 0037-Allow-to-change-the-piston-push-limit.patch} (97%) rename patches/server/{0039-Add-NBT-API-as-first-class-lib.patch => 0038-Add-NBT-API-as-first-class-lib.patch} (93%) rename patches/server/{0040-Player-saving-async-FileIO.patch => 0039-Player-saving-async-FileIO.patch} (99%) rename patches/server/{0041-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch => 0040-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch} (98%) rename patches/server/{0042-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch => 0041-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch} (96%) rename patches/server/{0043-Akarin-Save-json-list-async.patch => 0042-Akarin-Save-json-list-async.patch} (96%) rename patches/server/{0044-Akarin-Optimize-door-interact-with-pathfinding.patch => 0043-Akarin-Optimize-door-interact-with-pathfinding.patch} (99%) rename patches/server/{0045-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch => 0044-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch} (96%) rename patches/server/{0046-Purpur-Skip-events-if-there-s-no-listeners.patch => 0045-Purpur-Skip-events-if-there-s-no-listeners.patch} (96%) rename patches/server/{0047-Purpur-Add-more-timings-timers.patch => 0046-Purpur-Add-more-timings-timers.patch} (99%) rename patches/server/{0048-Modify-default-configs.patch => 0047-Modify-default-configs.patch} (96%) rename patches/server/{0049-lithium-MixinDirection.patch => 0048-lithium-MixinDirection.patch} (97%) rename patches/server/{0050-lithium-MixinBox.patch => 0049-lithium-MixinBox.patch} (96%) rename patches/server/{0051-lithium-enum_values.patch => 0050-lithium-enum_values.patch} (98%) rename patches/server/{0052-lithium-MixinAxisCycleDirection.patch => 0051-lithium-MixinAxisCycleDirection.patch} (98%) rename patches/server/{0053-lithium-MixinGoalSelector.patch => 0052-lithium-MixinGoalSelector.patch} (97%) rename patches/server/{0054-lithium-MixinLandPathNodeMaker.patch => 0053-lithium-MixinLandPathNodeMaker.patch} (98%) rename patches/server/{0055-lithium-MixinBiome.patch => 0054-lithium-MixinBiome.patch} (98%) rename patches/server/{0056-lithium-MixinTypeFilterableList.patch => 0055-lithium-MixinTypeFilterableList.patch} (98%) rename patches/server/{0057-Item-stuck-sleep-config.patch => 0056-Item-stuck-sleep-config.patch} (96%) rename patches/server/{0058-Option-for-simpler-Villagers.patch => 0057-Option-for-simpler-Villagers.patch} (99%) diff --git a/patches/api/0018-EMC-PlayerUseItemEvent.patch b/patches/api/0017-EMC-PlayerUseItemEvent.patch similarity index 99% rename from patches/api/0018-EMC-PlayerUseItemEvent.patch rename to patches/api/0017-EMC-PlayerUseItemEvent.patch index ff51bdb9..52b1cb09 100644 --- a/patches/api/0018-EMC-PlayerUseItemEvent.patch +++ b/patches/api/0017-EMC-PlayerUseItemEvent.patch @@ -1,4 +1,4 @@ -From 9c5d32e6e9ef2a3e4e9dfcc50badb44964de22db Mon Sep 17 00:00:00 2001 +From 0dc1464f8ad2c288ca853947560842de763b7890 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 7 Dec 2016 00:22:09 -0500 Subject: [PATCH] EMC PlayerUseItemEvent diff --git a/patches/api/0017-EMC-SendSignEvent.patch b/patches/api/0017-EMC-SendSignEvent.patch deleted file mode 100644 index 76eef55b..00000000 --- a/patches/api/0017-EMC-SendSignEvent.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f022849ac67458a58c8b98bf8e55a397f0daf869 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 4 Dec 2016 22:06:10 -0500 -Subject: [PATCH] EMC SendSignEvent - ---- - .../customevents/SendSignEvent.java | 45 +++++++++++++++++++ - 1 file changed, 45 insertions(+) - create mode 100644 src/main/java/com/empireminecraft/customevents/SendSignEvent.java - -diff --git a/src/main/java/com/empireminecraft/customevents/SendSignEvent.java b/src/main/java/com/empireminecraft/customevents/SendSignEvent.java -new file mode 100644 -index 000000000..c51559156 ---- /dev/null -+++ b/src/main/java/com/empireminecraft/customevents/SendSignEvent.java -@@ -0,0 +1,45 @@ -+/* -+ * Copyright (c) 2016 Starlis LLC / Daniel Ennis (Aikar) - MIT License -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+package com.empireminecraft.customevents; -+ -+import org.bukkit.block.Block; -+import org.bukkit.event.Event; -+import org.bukkit.event.HandlerList; -+ -+public abstract class SendSignEvent extends Event { -+ -+ public abstract Block getBlock(); -+ public abstract String[] getLines(); -+ public abstract void setLine(int i, String line); -+ -+ private static final HandlerList handlers = new HandlerList(); -+ -+ public HandlerList getHandlers() { -+ return handlers; -+ } -+ -+ public static HandlerList getHandlerList() { -+ return handlers; -+ } -+} --- -2.25.1.windows.1 - diff --git a/patches/api/0019-EMC-EntityAttackedEntityEvent.patch b/patches/api/0018-EMC-EntityAttackedEntityEvent.patch similarity index 99% rename from patches/api/0019-EMC-EntityAttackedEntityEvent.patch rename to patches/api/0018-EMC-EntityAttackedEntityEvent.patch index 68c48128..fbbc6901 100644 --- a/patches/api/0019-EMC-EntityAttackedEntityEvent.patch +++ b/patches/api/0018-EMC-EntityAttackedEntityEvent.patch @@ -1,4 +1,4 @@ -From af978551748c65ead4016b970c10bfa5ebdda436 Mon Sep 17 00:00:00 2001 +From 7558ddfe88217b313c46c0ec7caa7c2476479f06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 21:55:16 -0500 Subject: [PATCH] EMC EntityAttackedEntityEvent diff --git a/patches/api/0020-EMC-BlazeLaunchFireballEvent.patch b/patches/api/0019-EMC-BlazeLaunchFireballEvent.patch similarity index 97% rename from patches/api/0020-EMC-BlazeLaunchFireballEvent.patch rename to patches/api/0019-EMC-BlazeLaunchFireballEvent.patch index 763f937c..592494a4 100644 --- a/patches/api/0020-EMC-BlazeLaunchFireballEvent.patch +++ b/patches/api/0019-EMC-BlazeLaunchFireballEvent.patch @@ -1,4 +1,4 @@ -From 407cd37b4cbc950b9ae2982e3590768c20a2267e Mon Sep 17 00:00:00 2001 +From 8e24ceec37ab2fb1a40b0004a4b01b137f501a1f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 May 2018 20:25:37 -0400 Subject: [PATCH] EMC BlazeLaunchFireballEvent diff --git a/patches/api/0021-EMC-Human-getAttackPct.patch b/patches/api/0020-EMC-Human-getAttackPct.patch similarity index 91% rename from patches/api/0021-EMC-Human-getAttackPct.patch rename to patches/api/0020-EMC-Human-getAttackPct.patch index 02fd56ce..9ffb215f 100644 --- a/patches/api/0021-EMC-Human-getAttackPct.patch +++ b/patches/api/0020-EMC-Human-getAttackPct.patch @@ -1,4 +1,4 @@ -From 9121b345cd0acaedac2c574353afd51cbf880541 Mon Sep 17 00:00:00 2001 +From 00ea91f49ff5e2e1885a117fe06d77975ad21cc9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Jun 2018 02:08:40 -0400 Subject: [PATCH] EMC Human#getAttackPct diff --git a/patches/api/0022-EMC-SpawnEggMeta-setSpawnedEntity-API.patch b/patches/api/0021-EMC-SpawnEggMeta-setSpawnedEntity-API.patch similarity index 97% rename from patches/api/0022-EMC-SpawnEggMeta-setSpawnedEntity-API.patch rename to patches/api/0021-EMC-SpawnEggMeta-setSpawnedEntity-API.patch index d533cdb5..3841aa9d 100644 --- a/patches/api/0022-EMC-SpawnEggMeta-setSpawnedEntity-API.patch +++ b/patches/api/0021-EMC-SpawnEggMeta-setSpawnedEntity-API.patch @@ -1,4 +1,4 @@ -From 2bef044d75da8e5889688f92a96b5b1dc9408669 Mon Sep 17 00:00:00 2001 +From 7094b3659d2dd916153c186397afa1166c03ae93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 21:09:39 -0400 Subject: [PATCH] EMC SpawnEggMeta#setSpawnedEntity API diff --git a/patches/api/0023-EMC-Add-ConduitNewTargetEvent.patch b/patches/api/0022-EMC-Add-ConduitNewTargetEvent.patch similarity index 96% rename from patches/api/0023-EMC-Add-ConduitNewTargetEvent.patch rename to patches/api/0022-EMC-Add-ConduitNewTargetEvent.patch index 11056bc7..a1c51a8d 100644 --- a/patches/api/0023-EMC-Add-ConduitNewTargetEvent.patch +++ b/patches/api/0022-EMC-Add-ConduitNewTargetEvent.patch @@ -1,4 +1,4 @@ -From 4dfd3e3ba5416bc7bc9d0466ca16a55aa9f90ec2 Mon Sep 17 00:00:00 2001 +From 0fa053d7c4445f2241a5e49d6c4bc9909ad10ab9 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Sun, 14 Jul 2019 13:50:18 -0500 Subject: [PATCH] EMC Add ConduitNewTargetEvent diff --git a/patches/api/0024-EMC-Add-a-PlayerThrowTrident-event.patch b/patches/api/0023-EMC-Add-a-PlayerThrowTrident-event.patch similarity index 96% rename from patches/api/0024-EMC-Add-a-PlayerThrowTrident-event.patch rename to patches/api/0023-EMC-Add-a-PlayerThrowTrident-event.patch index 8d45b66d..ab9eb64e 100644 --- a/patches/api/0024-EMC-Add-a-PlayerThrowTrident-event.patch +++ b/patches/api/0023-EMC-Add-a-PlayerThrowTrident-event.patch @@ -1,4 +1,4 @@ -From 665022e1bd9e348a94d4371720c138a09787a632 Mon Sep 17 00:00:00 2001 +From ee8f6d71dfddc1d1a4202156d06cceef1ba0f9da Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 29 Nov 2019 02:47:35 -0600 Subject: [PATCH] EMC Add a PlayerThrowTrident event diff --git a/patches/api/0025-EMC-Add-a-BlockHarvestBeehiveEvent.patch b/patches/api/0024-EMC-Add-a-BlockHarvestBeehiveEvent.patch similarity index 97% rename from patches/api/0025-EMC-Add-a-BlockHarvestBeehiveEvent.patch rename to patches/api/0024-EMC-Add-a-BlockHarvestBeehiveEvent.patch index f3c26ef8..696349ea 100644 --- a/patches/api/0025-EMC-Add-a-BlockHarvestBeehiveEvent.patch +++ b/patches/api/0024-EMC-Add-a-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From 905997f718d162d99c813fc4c69a188e0aa2a37f Mon Sep 17 00:00:00 2001 +From 501bfd3c933463bd4234d90973e387b50b24de1f Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 17 Jan 2020 21:27:29 -0600 Subject: [PATCH] EMC Add a BlockHarvestBeehiveEvent diff --git a/patches/api/0026-Kill-AnnotationTest.patch b/patches/api/0025-Kill-AnnotationTest.patch similarity index 99% rename from patches/api/0026-Kill-AnnotationTest.patch rename to patches/api/0025-Kill-AnnotationTest.patch index 41964ba8..855b9649 100644 --- a/patches/api/0026-Kill-AnnotationTest.patch +++ b/patches/api/0025-Kill-AnnotationTest.patch @@ -1,4 +1,4 @@ -From 8bbd139fbb0c42d90bba5c9f523c9d0c4eddfc1f Mon Sep 17 00:00:00 2001 +From 52f749da74d25a52cffdfcfe3074c9c4fc3956fb Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 20:10:31 +0100 Subject: [PATCH] Kill AnnotationTest diff --git a/patches/api/0027-Add-GameProfileLookupEvent.patch b/patches/api/0026-Add-GameProfileLookupEvent.patch similarity index 97% rename from patches/api/0027-Add-GameProfileLookupEvent.patch rename to patches/api/0026-Add-GameProfileLookupEvent.patch index ed71a00d..c513d099 100644 --- a/patches/api/0027-Add-GameProfileLookupEvent.patch +++ b/patches/api/0026-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From db51350acaba574b49d07f5203305cc33221289c Mon Sep 17 00:00:00 2001 +From 13418a9704424199ec438a0902be3707801ed055 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 22:21:14 +0100 Subject: [PATCH] Add GameProfileLookupEvent diff --git a/patches/api/0028-Add-getLastTickMs-api.patch b/patches/api/0027-Add-getLastTickMs-api.patch similarity index 95% rename from patches/api/0028-Add-getLastTickMs-api.patch rename to patches/api/0027-Add-getLastTickMs-api.patch index 399b5b51..f6f149a0 100644 --- a/patches/api/0028-Add-getLastTickMs-api.patch +++ b/patches/api/0027-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 0647e5b9a20ea42594481af133f9b5e108a863b7 Mon Sep 17 00:00:00 2001 +From 57d7a7ef1af8f2c43b23e1ac143990866a7dc861 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:14 +0100 Subject: [PATCH] Add getLastTickMs() api diff --git a/patches/api/0029-Add-NBT-API-as-first-class-lib.patch b/patches/api/0028-Add-NBT-API-as-first-class-lib.patch similarity index 98% rename from patches/api/0029-Add-NBT-API-as-first-class-lib.patch rename to patches/api/0028-Add-NBT-API-as-first-class-lib.patch index e7a624cc..5d5cff87 100644 --- a/patches/api/0029-Add-NBT-API-as-first-class-lib.patch +++ b/patches/api/0028-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 4498f1819d8df0dae048fb7316db6f6ae095bc00 Mon Sep 17 00:00:00 2001 +From b5a55ea43296414f1d165aa3bd643e9fc5ca4299 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:56 +0200 Subject: [PATCH] Add NBT-API as first-class lib diff --git a/patches/api/0030-EMC-Add-ChatColor.getById.patch b/patches/api/0029-EMC-Add-ChatColor.getById.patch similarity index 95% rename from patches/api/0030-EMC-Add-ChatColor.getById.patch rename to patches/api/0029-EMC-Add-ChatColor.getById.patch index fe01032f..b5ccb0ac 100644 --- a/patches/api/0030-EMC-Add-ChatColor.getById.patch +++ b/patches/api/0029-EMC-Add-ChatColor.getById.patch @@ -1,4 +1,4 @@ -From 66ff7af953a624d9119d88ba37487319b323bf06 Mon Sep 17 00:00:00 2001 +From 4794bde4a196219c0f7e564dbb98805fde222ced Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 24 Apr 2017 20:27:23 -0400 Subject: [PATCH] EMC Add ChatColor.getById diff --git a/patches/server/0018-EMC-SendSignEvent.patch b/patches/server/0018-EMC-SendSignEvent.patch deleted file mode 100644 index 9f9d1991..00000000 --- a/patches/server/0018-EMC-SendSignEvent.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 6aae146f096f8f3a6b6ef5f0cf00abd9f3de9ed7 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Mon, 8 Jun 2015 23:55:20 -0400 -Subject: [PATCH] EMC SendSignEvent - ---- - .../api/SendSignEventImpl.java | 42 +++++++++++++++++++ - .../net/minecraft/server/TileEntitySign.java | 13 +++++- - 2 files changed, 53 insertions(+), 2 deletions(-) - create mode 100644 src/main/java/com/empireminecraft/api/SendSignEventImpl.java - -diff --git a/src/main/java/com/empireminecraft/api/SendSignEventImpl.java b/src/main/java/com/empireminecraft/api/SendSignEventImpl.java -new file mode 100644 -index 000000000..9f3cb62ff ---- /dev/null -+++ b/src/main/java/com/empireminecraft/api/SendSignEventImpl.java -@@ -0,0 +1,42 @@ -+package com.empireminecraft.api; -+ -+import com.empireminecraft.customevents.SendSignEvent; -+import net.minecraft.server.BlockPosition; -+import net.minecraft.server.ChatComponentText; -+import net.minecraft.server.IChatBaseComponent; -+import net.minecraft.server.World; -+import org.bukkit.block.Block; -+import org.bukkit.craftbukkit.util.CraftChatMessage; -+import org.bukkit.event.Event; -+import org.bukkit.event.HandlerList; -+ -+public class SendSignEventImpl extends SendSignEvent { -+ public final IChatBaseComponent[] lines; -+ private final String[] slines; -+ private final Block block; -+ -+ public SendSignEventImpl(World world, BlockPosition position, IChatBaseComponent[] lines) { -+ this.block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()); -+ this.lines = new IChatBaseComponent[lines.length]; -+ this.slines = new String[lines.length]; -+ for (int i = 0; i < lines.length; i++) { -+ this.lines[i] = lines[i]; -+ slines[i] = CraftChatMessage.fromComponent(lines[i]); -+ } -+ } -+ -+ public Block getBlock() { -+ return block; -+ } -+ -+ public String[] getLines() { -+ return slines; -+ } -+ public void setLine(int i, String line) { -+ slines[i] = line; -+ lines[i] = new ChatComponentText(""); -+ for (IChatBaseComponent comp : CraftChatMessage.fromString(line)) { -+ lines[i].addSibling(comp); -+ } -+ } -+} -diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 0e9a90b70..6323fe559 100644 ---- a/src/main/java/net/minecraft/server/TileEntitySign.java -+++ b/src/main/java/net/minecraft/server/TileEntitySign.java -@@ -20,10 +20,15 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - - @Override - public NBTTagCompound save(NBTTagCompound nbttagcompound) { -+ // EMC start -+ return save(nbttagcompound, this.lines); -+ } -+ public NBTTagCompound save(NBTTagCompound nbttagcompound, IChatBaseComponent[] lines) { -+ // EMC end - super.save(nbttagcompound); - - for (int i = 0; i < 4; ++i) { -- String s = IChatBaseComponent.ChatSerializer.a(this.lines[i]); -+ String s = IChatBaseComponent.ChatSerializer.a(lines[i]); // EMC - - nbttagcompound.setString("Text" + (i + 1), s); - } -@@ -97,7 +102,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // - - @Override - public NBTTagCompound b() { -- return this.save(new NBTTagCompound()); -+ // EMC start -+ com.empireminecraft.api.SendSignEventImpl event = new com.empireminecraft.api.SendSignEventImpl(this.world, this.getPosition(), this.lines); -+ event.callEvent(); -+ return this.save(new NBTTagCompound(), event.lines); -+ // EMC end - } - - @Override --- -2.25.1.windows.1 - diff --git a/patches/server/0019-EMC-ServerReloadEvent.patch b/patches/server/0018-EMC-ServerReloadEvent.patch similarity index 94% rename from patches/server/0019-EMC-ServerReloadEvent.patch rename to patches/server/0018-EMC-ServerReloadEvent.patch index c58fec2d..9366560b 100644 --- a/patches/server/0019-EMC-ServerReloadEvent.patch +++ b/patches/server/0018-EMC-ServerReloadEvent.patch @@ -1,4 +1,4 @@ -From ccca7d5158b85d1008512cf7ad16fa6ec277eaa4 Mon Sep 17 00:00:00 2001 +From 8838825c46b92baf9a3959360cc013e0e98512f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 25 Jun 2015 21:00:09 -0400 Subject: [PATCH] EMC ServerReloadEvent diff --git a/patches/server/0020-EMC-SnowmanThrowSnowballEvent.patch b/patches/server/0019-EMC-SnowmanThrowSnowballEvent.patch similarity index 97% rename from patches/server/0020-EMC-SnowmanThrowSnowballEvent.patch rename to patches/server/0019-EMC-SnowmanThrowSnowballEvent.patch index eb25992d..0a235288 100644 --- a/patches/server/0020-EMC-SnowmanThrowSnowballEvent.patch +++ b/patches/server/0019-EMC-SnowmanThrowSnowballEvent.patch @@ -1,4 +1,4 @@ -From f74447a137ed7ed962958aec1c4671bc75722000 Mon Sep 17 00:00:00 2001 +From d783496b060c74d30ec174f08b4d28db6a32240c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 21 Dec 2015 13:33:00 -0500 Subject: [PATCH] EMC SnowmanThrowSnowballEvent diff --git a/patches/server/0021-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0020-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 94% rename from patches/server/0021-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0020-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch index 889a2d24..cae9a012 100644 --- a/patches/server/0021-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch +++ b/patches/server/0020-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch @@ -1,4 +1,4 @@ -From dac14e3af291c353cda1f3e849a6babc7997b3a6 Mon Sep 17 00:00:00 2001 +From 2f7775f215dfaa838a8f0291df085f0170d52616 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 1 Jun 2016 23:29:17 -0400 Subject: [PATCH] EMC Reset Ender Crystals on Dragon Spawn diff --git a/patches/server/0022-EMC-EntityAttackedEntityEvent.patch b/patches/server/0021-EMC-EntityAttackedEntityEvent.patch similarity index 95% rename from patches/server/0022-EMC-EntityAttackedEntityEvent.patch rename to patches/server/0021-EMC-EntityAttackedEntityEvent.patch index 66048e43..a0b1208f 100644 --- a/patches/server/0022-EMC-EntityAttackedEntityEvent.patch +++ b/patches/server/0021-EMC-EntityAttackedEntityEvent.patch @@ -1,4 +1,4 @@ -From 08b0074017610f848d2f6eb01ba130aeb12fcdfa Mon Sep 17 00:00:00 2001 +From ada07cd97f6156000435baa7ea856c47734567df Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 21:42:45 -0500 Subject: [PATCH] EMC EntityAttackedEntityEvent diff --git a/patches/server/0023-EMC-Human-getAttackPct.patch b/patches/server/0022-EMC-Human-getAttackPct.patch similarity index 96% rename from patches/server/0023-EMC-Human-getAttackPct.patch rename to patches/server/0022-EMC-Human-getAttackPct.patch index 7cc51b4b..922c847e 100644 --- a/patches/server/0023-EMC-Human-getAttackPct.patch +++ b/patches/server/0022-EMC-Human-getAttackPct.patch @@ -1,4 +1,4 @@ -From 7a671b07008e2538b8a5196a10aff98c218ffb51 Mon Sep 17 00:00:00 2001 +From 979225fb1762c9b4aee62feba99afb9bc35f096b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Jun 2018 02:09:37 -0400 Subject: [PATCH] EMC Human#getAttackPct diff --git a/patches/server/0024-EMC-Tweak-Explosions.patch b/patches/server/0023-EMC-Tweak-Explosions.patch similarity index 97% rename from patches/server/0024-EMC-Tweak-Explosions.patch rename to patches/server/0023-EMC-Tweak-Explosions.patch index 9c4e221b..941cf4c3 100644 --- a/patches/server/0024-EMC-Tweak-Explosions.patch +++ b/patches/server/0023-EMC-Tweak-Explosions.patch @@ -1,4 +1,4 @@ -From df90457b43f1bc99a25462639cf799db6449f7c5 Mon Sep 17 00:00:00 2001 +From f749ae5ccf988b6c09be53cf99b7e462063feb53 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 22:35:39 -0400 Subject: [PATCH] EMC Tweak Explosions diff --git a/patches/server/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch b/patches/server/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch similarity index 97% rename from patches/server/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch rename to patches/server/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch index 57560e5b..8951228c 100644 --- a/patches/server/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch +++ b/patches/server/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch @@ -1,4 +1,4 @@ -From 38bbdf33f05878fe8810572db891f5db48818798 Mon Sep 17 00:00:00 2001 +From 60e46f496c569bccb4bbba4846976ac50b1e8731 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 22:03:33 -0400 Subject: [PATCH] EMC SpawnEggMeta#setSpawnedEntity API diff --git a/patches/server/0026-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch b/patches/server/0025-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch similarity index 97% rename from patches/server/0026-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch rename to patches/server/0025-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch index 94875fe8..61fa8538 100644 --- a/patches/server/0026-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch +++ b/patches/server/0025-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch @@ -1,4 +1,4 @@ -From df092d673288fed35b1ef1bdee1aacc3204fd55d Mon Sep 17 00:00:00 2001 +From 01c6938c93255619c89e749911cc41df63f2655a Mon Sep 17 00:00:00 2001 From: chickeneer Date: Sun, 14 Jul 2019 13:50:53 -0500 Subject: [PATCH] EMC ConduitNewTargetEvent and remove target for cancelled diff --git a/patches/server/0027-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch b/patches/server/0026-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch similarity index 99% rename from patches/server/0027-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch rename to patches/server/0026-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch index 8aa90cb5..dd4e79cc 100644 --- a/patches/server/0027-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch +++ b/patches/server/0026-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch @@ -1,4 +1,4 @@ -From 86f1e86c5940cfee7980a46e17f2f85a1a3f2963 Mon Sep 17 00:00:00 2001 +From db51502b040569dcacc24b38213690c21bd8b4ca Mon Sep 17 00:00:00 2001 From: willies952002 Date: Fri, 16 Aug 2019 22:18:35 -0400 Subject: [PATCH] EMC Fix Bukkit.createInventory() with type LECTERN diff --git a/patches/server/0028-EMC-Add-the-PlayerThrowTridentEvent.patch b/patches/server/0027-EMC-Add-the-PlayerThrowTridentEvent.patch similarity index 95% rename from patches/server/0028-EMC-Add-the-PlayerThrowTridentEvent.patch rename to patches/server/0027-EMC-Add-the-PlayerThrowTridentEvent.patch index 26448001..35408ec8 100644 --- a/patches/server/0028-EMC-Add-the-PlayerThrowTridentEvent.patch +++ b/patches/server/0027-EMC-Add-the-PlayerThrowTridentEvent.patch @@ -1,4 +1,4 @@ -From 308a9b1edb5e29671b352eba6aa3e5866ebeaab8 Mon Sep 17 00:00:00 2001 +From ab02a56558a446bdd59ee0d545181dc1cc5c8654 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 29 Nov 2019 02:48:17 -0600 Subject: [PATCH] EMC Add the PlayerThrowTridentEvent diff --git a/patches/server/0029-EMC-Add-the-BlockHarvestBeehiveEvent.patch b/patches/server/0028-EMC-Add-the-BlockHarvestBeehiveEvent.patch similarity index 96% rename from patches/server/0029-EMC-Add-the-BlockHarvestBeehiveEvent.patch rename to patches/server/0028-EMC-Add-the-BlockHarvestBeehiveEvent.patch index 7f5aa89c..6b04d128 100644 --- a/patches/server/0029-EMC-Add-the-BlockHarvestBeehiveEvent.patch +++ b/patches/server/0028-EMC-Add-the-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From 86a7822eb311f148d7a342f30e2dc25a1cb4ec24 Mon Sep 17 00:00:00 2001 +From 92ca427597f1f01e52e82ba71c81b8148ceab7ef Mon Sep 17 00:00:00 2001 From: chickeneer Date: Fri, 17 Jan 2020 21:32:10 -0600 Subject: [PATCH] EMC Add the BlockHarvestBeehiveEvent diff --git a/patches/server/0030-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch b/patches/server/0029-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch similarity index 94% rename from patches/server/0030-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch rename to patches/server/0029-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch index 4611eaa8..2b5e3e3c 100644 --- a/patches/server/0030-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch +++ b/patches/server/0029-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch @@ -1,4 +1,4 @@ -From 70271017cfc266184f2c328daced580da0ebc80a Mon Sep 17 00:00:00 2001 +From ba093bacd8385828644662b4da96ec7b57bed9ab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 4 Jun 2019 15:50:08 -0500 Subject: [PATCH] Purpur Fix 'outdated server' showing in ping before server diff --git a/patches/server/0031-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0030-Don-t-save-Fireworks-and-Arrows.patch similarity index 93% rename from patches/server/0031-Don-t-save-Fireworks-and-Arrows.patch rename to patches/server/0030-Don-t-save-Fireworks-and-Arrows.patch index 5069650f..8b9ebdf9 100644 --- a/patches/server/0031-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0030-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From 4e546d712b1842e73545b91ee8be0207f0057d1a Mon Sep 17 00:00:00 2001 +From dcb243542a2a24563d515100a9b9c393c66d0ae2 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 21:39:58 +0100 Subject: [PATCH] Don't save Fireworks and Arrows diff --git a/patches/server/0032-Add-GameProfileLookupEvent.patch b/patches/server/0031-Add-GameProfileLookupEvent.patch similarity index 98% rename from patches/server/0032-Add-GameProfileLookupEvent.patch rename to patches/server/0031-Add-GameProfileLookupEvent.patch index 6ee9d8f7..6da4c834 100644 --- a/patches/server/0032-Add-GameProfileLookupEvent.patch +++ b/patches/server/0031-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 17e4087e3894b4115f0166cba4fc799249ca4820 Mon Sep 17 00:00:00 2001 +From c0d3a9e3616702772a7c84f5e74cb76f43edf038 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 22:22:02 +0100 Subject: [PATCH] Add GameProfileLookupEvent diff --git a/patches/server/0033-Add-getLastTickMs-api.patch b/patches/server/0032-Add-getLastTickMs-api.patch similarity index 98% rename from patches/server/0033-Add-getLastTickMs-api.patch rename to patches/server/0032-Add-getLastTickMs-api.patch index ec2b6eb0..b0eca8ad 100644 --- a/patches/server/0033-Add-getLastTickMs-api.patch +++ b/patches/server/0032-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 23c569b0036799cf244c5195b6a4efa42dcfac67 Mon Sep 17 00:00:00 2001 +From 62ec7712ed6ecad895b32d7968ff4200110af0ec Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api diff --git a/patches/server/0034-Add-config-yapfa-command-and-basic-settings.patch b/patches/server/0033-Add-config-yapfa-command-and-basic-settings.patch similarity index 99% rename from patches/server/0034-Add-config-yapfa-command-and-basic-settings.patch rename to patches/server/0033-Add-config-yapfa-command-and-basic-settings.patch index 5ae948ae..8f96774a 100644 --- a/patches/server/0034-Add-config-yapfa-command-and-basic-settings.patch +++ b/patches/server/0033-Add-config-yapfa-command-and-basic-settings.patch @@ -1,4 +1,4 @@ -From 2ac07dcf885682a7a76fb970ba2a3de413a03456 Mon Sep 17 00:00:00 2001 +From 6f518067553e9a77f33a2b71594219d86403f4ea Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings diff --git a/patches/server/0035-Kill-the-vanilla-GameProfiler.patch b/patches/server/0034-Kill-the-vanilla-GameProfiler.patch similarity index 97% rename from patches/server/0035-Kill-the-vanilla-GameProfiler.patch rename to patches/server/0034-Kill-the-vanilla-GameProfiler.patch index 4ece43ab..08d2acb3 100644 --- a/patches/server/0035-Kill-the-vanilla-GameProfiler.patch +++ b/patches/server/0034-Kill-the-vanilla-GameProfiler.patch @@ -1,4 +1,4 @@ -From 22377ef98dec05e8777293c9be2454593b9c6bad Mon Sep 17 00:00:00 2001 +From 1f3dd8087b0e674afbaa194b51590251711a6991 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] Kill the vanilla "GameProfiler" diff --git a/patches/server/0036-Remove-Stream-usage.patch b/patches/server/0035-Remove-Stream-usage.patch similarity index 99% rename from patches/server/0036-Remove-Stream-usage.patch rename to patches/server/0035-Remove-Stream-usage.patch index 5c13834b..2e569281 100644 --- a/patches/server/0036-Remove-Stream-usage.patch +++ b/patches/server/0035-Remove-Stream-usage.patch @@ -1,4 +1,4 @@ -From db941ef3d6e61c68d2c52ca4562961f4db54d676 Mon Sep 17 00:00:00 2001 +From 54a9bdd5035163c71af0cb425d3a9945be4d19d2 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 23 Mar 2020 18:20:58 +0100 Subject: [PATCH] Remove Stream usage diff --git a/patches/server/0037-Add-option-for-only-players-to-have-collisions-with-.patch b/patches/server/0036-Add-option-for-only-players-to-have-collisions-with-.patch similarity index 98% rename from patches/server/0037-Add-option-for-only-players-to-have-collisions-with-.patch rename to patches/server/0036-Add-option-for-only-players-to-have-collisions-with-.patch index 7a3a4953..2c9a447d 100644 --- a/patches/server/0037-Add-option-for-only-players-to-have-collisions-with-.patch +++ b/patches/server/0036-Add-option-for-only-players-to-have-collisions-with-.patch @@ -1,4 +1,4 @@ -From b760096793cfc4f8fa27175ae331f5fff18db419 Mon Sep 17 00:00:00 2001 +From cbc381e8a8b5dab8c94757bfd8ff84c83d47223e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 23 Mar 2020 23:11:10 +0100 Subject: [PATCH] Add option for only players to have collisions with Entities diff --git a/patches/server/0038-Allow-to-change-the-piston-push-limit.patch b/patches/server/0037-Allow-to-change-the-piston-push-limit.patch similarity index 97% rename from patches/server/0038-Allow-to-change-the-piston-push-limit.patch rename to patches/server/0037-Allow-to-change-the-piston-push-limit.patch index 6033c36a..ff6739e4 100644 --- a/patches/server/0038-Allow-to-change-the-piston-push-limit.patch +++ b/patches/server/0037-Allow-to-change-the-piston-push-limit.patch @@ -1,4 +1,4 @@ -From c4fc28ab2dbdd7291b59b7965ca1b63b4e44cfc4 Mon Sep 17 00:00:00 2001 +From 63da5c960563a9e464659ce236f5f157e663fc49 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 29 Mar 2020 00:35:03 +0100 Subject: [PATCH] Allow to change the piston push limit diff --git a/patches/server/0039-Add-NBT-API-as-first-class-lib.patch b/patches/server/0038-Add-NBT-API-as-first-class-lib.patch similarity index 93% rename from patches/server/0039-Add-NBT-API-as-first-class-lib.patch rename to patches/server/0038-Add-NBT-API-as-first-class-lib.patch index 5d032905..9b34e697 100644 --- a/patches/server/0039-Add-NBT-API-as-first-class-lib.patch +++ b/patches/server/0038-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From eb3bccb1c4c5e29c05b9f7ae91fa643e2aa75a1c Mon Sep 17 00:00:00 2001 +From c0898b6a58fe806a40f9f49fdb2bc618514297c8 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:38 +0200 Subject: [PATCH] Add NBT-API as first-class lib diff --git a/patches/server/0040-Player-saving-async-FileIO.patch b/patches/server/0039-Player-saving-async-FileIO.patch similarity index 99% rename from patches/server/0040-Player-saving-async-FileIO.patch rename to patches/server/0039-Player-saving-async-FileIO.patch index f3274845..fab76412 100644 --- a/patches/server/0040-Player-saving-async-FileIO.patch +++ b/patches/server/0039-Player-saving-async-FileIO.patch @@ -1,4 +1,4 @@ -From b2264f6d9362643f3f2699e4e0addb0e2b159c01 Mon Sep 17 00:00:00 2001 +From 0dd482a0728db2b40c63b1d62d799a51d45cc11c Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 4 Apr 2020 23:23:04 +0200 Subject: [PATCH] Player saving async FileIO diff --git a/patches/server/0041-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch b/patches/server/0040-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch similarity index 98% rename from patches/server/0041-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch rename to patches/server/0040-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch index 3bfe9e61..9dbc3f17 100644 --- a/patches/server/0041-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch +++ b/patches/server/0040-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch @@ -1,4 +1,4 @@ -From 9a7a3ed3e1487648a492e96c08b7381f388e2c30 Mon Sep 17 00:00:00 2001 +From d2f92d223a1713c1d8fe0c45ffb28e30481209b8 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 6 Apr 2020 01:05:08 +0200 Subject: [PATCH] Stop a pathfinder method to call itself more than once diff --git a/patches/server/0042-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch b/patches/server/0041-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch similarity index 96% rename from patches/server/0042-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch rename to patches/server/0041-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch index 5fa5300f..ae03752e 100644 --- a/patches/server/0042-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch +++ b/patches/server/0041-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch @@ -1,4 +1,4 @@ -From 2c0cf612a5b6f9981356c4419efbaf02666a68fb Mon Sep 17 00:00:00 2001 +From cc1010c26310272c4ba064408870bc5ca13c76f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:29:08 +0800 diff --git a/patches/server/0043-Akarin-Save-json-list-async.patch b/patches/server/0042-Akarin-Save-json-list-async.patch similarity index 96% rename from patches/server/0043-Akarin-Save-json-list-async.patch rename to patches/server/0042-Akarin-Save-json-list-async.patch index 6609e84f..2724cf83 100644 --- a/patches/server/0043-Akarin-Save-json-list-async.patch +++ b/patches/server/0042-Akarin-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 45b87f4b8942fb1334392e88fcaa8bef26365f6b Mon Sep 17 00:00:00 2001 +From 9e840e4a39728a5f36b0ce3a79e9f3b9fddbd2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?= Date: Thu, 2 Apr 2020 11:16:18 +0800 diff --git a/patches/server/0044-Akarin-Optimize-door-interact-with-pathfinding.patch b/patches/server/0043-Akarin-Optimize-door-interact-with-pathfinding.patch similarity index 99% rename from patches/server/0044-Akarin-Optimize-door-interact-with-pathfinding.patch rename to patches/server/0043-Akarin-Optimize-door-interact-with-pathfinding.patch index 1d3d36ed..fb66054f 100644 --- a/patches/server/0044-Akarin-Optimize-door-interact-with-pathfinding.patch +++ b/patches/server/0043-Akarin-Optimize-door-interact-with-pathfinding.patch @@ -1,4 +1,4 @@ -From 1d6a520e18cce3c9dfaabd08b92406a8efcccc35 Mon Sep 17 00:00:00 2001 +From 617cb03e6388b01fac2a9e8b3d31cd1b3496dbc5 Mon Sep 17 00:00:00 2001 From: Sotr Date: Wed, 15 Apr 2020 03:51:50 +0700 Subject: [PATCH] Akarin Optimize door interact with pathfinding diff --git a/patches/server/0045-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch b/patches/server/0044-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch similarity index 96% rename from patches/server/0045-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch rename to patches/server/0044-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch index fbf30cc5..8398f236 100644 --- a/patches/server/0045-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch +++ b/patches/server/0044-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch @@ -1,4 +1,4 @@ -From 438b82c82ce806547f9cd780dd5160c5cd9cdd90 Mon Sep 17 00:00:00 2001 +From bb1039b72c063e2a5f8185a3aeb64014bca60ff4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] Purpur MC-125757 Fix - Always increment arrow despawn counter diff --git a/patches/server/0046-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0045-Purpur-Skip-events-if-there-s-no-listeners.patch similarity index 96% rename from patches/server/0046-Purpur-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0045-Purpur-Skip-events-if-there-s-no-listeners.patch index 3debfed6..db8f31b8 100644 --- a/patches/server/0046-Purpur-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0045-Purpur-Skip-events-if-there-s-no-listeners.patch @@ -1,4 +1,4 @@ -From f4442c7d7a0cf6968f189c50bbc80275afddd2ab Mon Sep 17 00:00:00 2001 +From fbfdf8d2a0899a87c93b7de7ddcfcf7fd94bb1a5 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 03:07:59 -0500 Subject: [PATCH] Purpur Skip events if there's no listeners diff --git a/patches/server/0047-Purpur-Add-more-timings-timers.patch b/patches/server/0046-Purpur-Add-more-timings-timers.patch similarity index 99% rename from patches/server/0047-Purpur-Add-more-timings-timers.patch rename to patches/server/0046-Purpur-Add-more-timings-timers.patch index 777ca66a..f3159ae5 100644 --- a/patches/server/0047-Purpur-Add-more-timings-timers.patch +++ b/patches/server/0046-Purpur-Add-more-timings-timers.patch @@ -1,4 +1,4 @@ -From 52bb26a9ea0a2452c5c9bca9ad02e7c77b51b292 Mon Sep 17 00:00:00 2001 +From ce9af22565f9719a92cb3011327c997b6bd72ee9 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 21 Apr 2020 15:49:52 +0200 Subject: [PATCH] Purpur Add more timings timers diff --git a/patches/server/0048-Modify-default-configs.patch b/patches/server/0047-Modify-default-configs.patch similarity index 96% rename from patches/server/0048-Modify-default-configs.patch rename to patches/server/0047-Modify-default-configs.patch index e6396a86..1bc04b79 100644 --- a/patches/server/0048-Modify-default-configs.patch +++ b/patches/server/0047-Modify-default-configs.patch @@ -1,4 +1,4 @@ -From 67f882c66b72401653ab1a96c2654230029577fe Mon Sep 17 00:00:00 2001 +From ab054278d0f0a33616d880af02263ac45ddd212e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 21 Apr 2020 16:14:10 +0200 Subject: [PATCH] Modify default configs diff --git a/patches/server/0049-lithium-MixinDirection.patch b/patches/server/0048-lithium-MixinDirection.patch similarity index 97% rename from patches/server/0049-lithium-MixinDirection.patch rename to patches/server/0048-lithium-MixinDirection.patch index fa43bd80..f06f34a2 100644 --- a/patches/server/0049-lithium-MixinDirection.patch +++ b/patches/server/0048-lithium-MixinDirection.patch @@ -1,4 +1,4 @@ -From 05b6c98e52b7d7b2fce93c779543351aaa2db26d Mon Sep 17 00:00:00 2001 +From 4b13ca08957ac2c70e129670244a74120f69d7e4 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 21:00:44 +0200 Subject: [PATCH] lithium MixinDirection diff --git a/patches/server/0050-lithium-MixinBox.patch b/patches/server/0049-lithium-MixinBox.patch similarity index 96% rename from patches/server/0050-lithium-MixinBox.patch rename to patches/server/0049-lithium-MixinBox.patch index 9bd17586..79415c52 100644 --- a/patches/server/0050-lithium-MixinBox.patch +++ b/patches/server/0049-lithium-MixinBox.patch @@ -1,4 +1,4 @@ -From 438e69645ee4b4c4cfa2e25f2835297f6058c104 Mon Sep 17 00:00:00 2001 +From a433ea4d262e200a4f746625dc641712a60e7524 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 21:02:57 +0200 Subject: [PATCH] lithium MixinBox diff --git a/patches/server/0051-lithium-enum_values.patch b/patches/server/0050-lithium-enum_values.patch similarity index 98% rename from patches/server/0051-lithium-enum_values.patch rename to patches/server/0050-lithium-enum_values.patch index 1f31ecdd..56a5eb47 100644 --- a/patches/server/0051-lithium-enum_values.patch +++ b/patches/server/0050-lithium-enum_values.patch @@ -1,4 +1,4 @@ -From fdcaddb5b944a4b8336f1366eb17d56610effd60 Mon Sep 17 00:00:00 2001 +From ab79d849781b7d9ce55ac075c3ba44ef131d1d32 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 21:37:44 +0200 Subject: [PATCH] lithium enum_values diff --git a/patches/server/0052-lithium-MixinAxisCycleDirection.patch b/patches/server/0051-lithium-MixinAxisCycleDirection.patch similarity index 98% rename from patches/server/0052-lithium-MixinAxisCycleDirection.patch rename to patches/server/0051-lithium-MixinAxisCycleDirection.patch index 26f8c4dc..82a5aec7 100644 --- a/patches/server/0052-lithium-MixinAxisCycleDirection.patch +++ b/patches/server/0051-lithium-MixinAxisCycleDirection.patch @@ -1,4 +1,4 @@ -From d189d64feadfe7f3fc629070d3557ffd8fd0437c Mon Sep 17 00:00:00 2001 +From 4234086655d80465db6e7bcc13936ab6bab9edd3 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 21:50:18 +0200 Subject: [PATCH] lithium MixinAxisCycleDirection diff --git a/patches/server/0053-lithium-MixinGoalSelector.patch b/patches/server/0052-lithium-MixinGoalSelector.patch similarity index 97% rename from patches/server/0053-lithium-MixinGoalSelector.patch rename to patches/server/0052-lithium-MixinGoalSelector.patch index 50595bbd..a38a6ac3 100644 --- a/patches/server/0053-lithium-MixinGoalSelector.patch +++ b/patches/server/0052-lithium-MixinGoalSelector.patch @@ -1,4 +1,4 @@ -From b4c37c7bec2c2f008dc0f1e026f0671f66a470b0 Mon Sep 17 00:00:00 2001 +From f2bae99a264f92eb358ffbe933bc640ecc913ab1 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 22:07:17 +0200 Subject: [PATCH] lithium MixinGoalSelector diff --git a/patches/server/0054-lithium-MixinLandPathNodeMaker.patch b/patches/server/0053-lithium-MixinLandPathNodeMaker.patch similarity index 98% rename from patches/server/0054-lithium-MixinLandPathNodeMaker.patch rename to patches/server/0053-lithium-MixinLandPathNodeMaker.patch index 79d57f1a..9642c9a6 100644 --- a/patches/server/0054-lithium-MixinLandPathNodeMaker.patch +++ b/patches/server/0053-lithium-MixinLandPathNodeMaker.patch @@ -1,4 +1,4 @@ -From 25166bf580189d46e8079fc911db66e6d8b5764e Mon Sep 17 00:00:00 2001 +From 1610e22769a72ab49a755f32df790a01c750b71b Mon Sep 17 00:00:00 2001 From: tr7zw Date: Mon, 11 May 2020 22:56:27 +0200 Subject: [PATCH] lithium MixinLandPathNodeMaker diff --git a/patches/server/0055-lithium-MixinBiome.patch b/patches/server/0054-lithium-MixinBiome.patch similarity index 98% rename from patches/server/0055-lithium-MixinBiome.patch rename to patches/server/0054-lithium-MixinBiome.patch index 1001d05f..9672a491 100644 --- a/patches/server/0055-lithium-MixinBiome.patch +++ b/patches/server/0054-lithium-MixinBiome.patch @@ -1,4 +1,4 @@ -From 341d1bb4bf918660c6158ae1a59317ac9e006adc Mon Sep 17 00:00:00 2001 +From b4ebbec2a49e352d00a35a45d0a9e0333fb3d5b3 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 12 May 2020 00:38:31 +0200 Subject: [PATCH] lithium MixinBiome diff --git a/patches/server/0056-lithium-MixinTypeFilterableList.patch b/patches/server/0055-lithium-MixinTypeFilterableList.patch similarity index 98% rename from patches/server/0056-lithium-MixinTypeFilterableList.patch rename to patches/server/0055-lithium-MixinTypeFilterableList.patch index 9c6a156d..b0304456 100644 --- a/patches/server/0056-lithium-MixinTypeFilterableList.patch +++ b/patches/server/0055-lithium-MixinTypeFilterableList.patch @@ -1,4 +1,4 @@ -From bf7421fa35e21e5dae77084d47a28b4f88349d8d Mon Sep 17 00:00:00 2001 +From 481a33f0227035223a90855c9d90d9139ac8ed98 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 12 May 2020 01:16:14 +0200 Subject: [PATCH] lithium MixinTypeFilterableList diff --git a/patches/server/0057-Item-stuck-sleep-config.patch b/patches/server/0056-Item-stuck-sleep-config.patch similarity index 96% rename from patches/server/0057-Item-stuck-sleep-config.patch rename to patches/server/0056-Item-stuck-sleep-config.patch index 5276e37a..72b02c25 100644 --- a/patches/server/0057-Item-stuck-sleep-config.patch +++ b/patches/server/0056-Item-stuck-sleep-config.patch @@ -1,4 +1,4 @@ -From a13fffc3d44d6fbb4a642646ff399b1a2cfb9c31 Mon Sep 17 00:00:00 2001 +From d345be4dc0b8cd474190e7b819fa315d90c9eced Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 16 Jun 2020 17:29:20 +0200 Subject: [PATCH] Item stuck sleep config diff --git a/patches/server/0058-Option-for-simpler-Villagers.patch b/patches/server/0057-Option-for-simpler-Villagers.patch similarity index 99% rename from patches/server/0058-Option-for-simpler-Villagers.patch rename to patches/server/0057-Option-for-simpler-Villagers.patch index 6a8f17a8..47cccceb 100644 --- a/patches/server/0058-Option-for-simpler-Villagers.patch +++ b/patches/server/0057-Option-for-simpler-Villagers.patch @@ -1,4 +1,4 @@ -From 744072bc8c39c69ea97d9de93868e6e2f5fead0f Mon Sep 17 00:00:00 2001 +From 203ec11528c759173d4c210127fe7c755dd285ca Mon Sep 17 00:00:00 2001 From: tr7zw Date: Fri, 19 Jun 2020 19:21:35 +0200 Subject: [PATCH] Option for simpler Villagers