diff --git a/Tuinity b/Tuinity index a02e9921..64e46c68 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit a02e99216340dd019211add1f545ed7ac5709b05 +Subproject commit 64e46c681979844896606fce78d43563544dcb10 diff --git a/patches/api/0015-EMC-EntityEffectAddedEvent.patch b/patches/api/0014-EMC-EntityEffectAddedEvent.patch similarity index 95% rename from patches/api/0015-EMC-EntityEffectAddedEvent.patch rename to patches/api/0014-EMC-EntityEffectAddedEvent.patch index 22fdb5a5..25a33b9e 100644 --- a/patches/api/0015-EMC-EntityEffectAddedEvent.patch +++ b/patches/api/0014-EMC-EntityEffectAddedEvent.patch @@ -1,4 +1,4 @@ -From 791e304ae7dee6a6361645f31a0a07f8e88617a6 Mon Sep 17 00:00:00 2001 +From 39fc7f6cbe7bf95831f21c7da56291e54457207d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 14:59:41 -0500 Subject: [PATCH] EMC EntityEffectAddedEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC EntityEffectAddedEvent diff --git a/src/main/java/com/empireminecraft/customevents/EntityEffectAddedEvent.java b/src/main/java/com/empireminecraft/customevents/EntityEffectAddedEvent.java new file mode 100644 -index 00000000..4695943b +index 000000000..4695943b1 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/EntityEffectAddedEvent.java @@ -0,0 +1,49 @@ diff --git a/patches/api/0014-EMC-ServerShutdownEvent.patch b/patches/api/0014-EMC-ServerShutdownEvent.patch deleted file mode 100644 index 7f0ad39f..00000000 --- a/patches/api/0014-EMC-ServerShutdownEvent.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5578a35a1ecf144435f1d1d802753d0726c26bf2 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 4 Dec 2016 01:19:40 -0500 -Subject: [PATCH] EMC ServerShutdownEvent - ---- - .../customevents/ServerShutdownEvent.java | 29 +++++++++++++++++++ - 1 file changed, 29 insertions(+) - create mode 100644 src/main/java/com/empireminecraft/customevents/ServerShutdownEvent.java - -diff --git a/src/main/java/com/empireminecraft/customevents/ServerShutdownEvent.java b/src/main/java/com/empireminecraft/customevents/ServerShutdownEvent.java -new file mode 100644 -index 00000000..43f761a1 ---- /dev/null -+++ b/src/main/java/com/empireminecraft/customevents/ServerShutdownEvent.java -@@ -0,0 +1,29 @@ -+package com.empireminecraft.customevents; -+ -+import org.bukkit.event.Event; -+import org.bukkit.event.HandlerList; -+ -+public class ServerShutdownEvent extends Event { -+ private String reason; -+ public ServerShutdownEvent(String reason) { -+ this.reason = reason; -+ } -+ -+ public String getReason() { -+ return reason; -+ } -+ -+ public void setReason(String reason) { -+ this.reason = reason; -+ } -+ -+ 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/0016-EMC-LivingEntityArmorProtectEvent.patch b/patches/api/0015-EMC-LivingEntityArmorProtectEvent.patch similarity index 94% rename from patches/api/0016-EMC-LivingEntityArmorProtectEvent.patch rename to patches/api/0015-EMC-LivingEntityArmorProtectEvent.patch index f91f0b57..70960b02 100644 --- a/patches/api/0016-EMC-LivingEntityArmorProtectEvent.patch +++ b/patches/api/0015-EMC-LivingEntityArmorProtectEvent.patch @@ -1,4 +1,4 @@ -From 6456de743157b78a9dabf3451c84a79026d2a576 Mon Sep 17 00:00:00 2001 +From b07bfdda605b86bed19a8e35690c6dee0512ceeb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 15:09:48 -0500 Subject: [PATCH] EMC LivingEntityArmorProtectEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC LivingEntityArmorProtectEvent diff --git a/src/main/java/com/empireminecraft/customevents/LivingEntityArmorProtectEvent.java b/src/main/java/com/empireminecraft/customevents/LivingEntityArmorProtectEvent.java new file mode 100644 -index 00000000..07e09573 +index 000000000..07e095737 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/LivingEntityArmorProtectEvent.java @@ -0,0 +1,38 @@ diff --git a/patches/api/0017-EMC-SpawnerInitiateEvent.patch b/patches/api/0016-EMC-SpawnerInitiateEvent.patch similarity index 97% rename from patches/api/0017-EMC-SpawnerInitiateEvent.patch rename to patches/api/0016-EMC-SpawnerInitiateEvent.patch index 97c2743d..77b24521 100644 --- a/patches/api/0017-EMC-SpawnerInitiateEvent.patch +++ b/patches/api/0016-EMC-SpawnerInitiateEvent.patch @@ -1,4 +1,4 @@ -From bfc59f63ece05ba4a3ccf345795d0bdbc2719530 Mon Sep 17 00:00:00 2001 +From 5386e799178b3d928b14a3fc73997bd5d7736b1d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 15:22:03 -0500 Subject: [PATCH] EMC SpawnerInitiateEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC SpawnerInitiateEvent diff --git a/src/main/java/com/empireminecraft/customevents/SpawnerInitiateEvent.java b/src/main/java/com/empireminecraft/customevents/SpawnerInitiateEvent.java new file mode 100644 -index 00000000..6c7d5821 +index 000000000..6c7d5821d --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/SpawnerInitiateEvent.java @@ -0,0 +1,88 @@ diff --git a/patches/api/0018-EMC-ZombieReinforcementEvent.patch b/patches/api/0017-EMC-ZombieReinforcementEvent.patch similarity index 95% rename from patches/api/0018-EMC-ZombieReinforcementEvent.patch rename to patches/api/0017-EMC-ZombieReinforcementEvent.patch index 815623bc..0bca93bf 100644 --- a/patches/api/0018-EMC-ZombieReinforcementEvent.patch +++ b/patches/api/0017-EMC-ZombieReinforcementEvent.patch @@ -1,4 +1,4 @@ -From 0f400e1f69af6ea50679b567ffdf4c986dda1be0 Mon Sep 17 00:00:00 2001 +From 83bf1f2f88d5c95ab7baa4a03776a927f0a6e8e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 15:27:06 -0500 Subject: [PATCH] EMC ZombieReinforcementEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC ZombieReinforcementEvent diff --git a/src/main/java/com/empireminecraft/customevents/ZombieReinforcementEvent.java b/src/main/java/com/empireminecraft/customevents/ZombieReinforcementEvent.java new file mode 100644 -index 00000000..5e0a9bb4 +index 000000000..5e0a9bb41 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/ZombieReinforcementEvent.java @@ -0,0 +1,52 @@ diff --git a/patches/api/0019-EMC-SnowmanThrowSnowballEvent.patch b/patches/api/0018-EMC-SnowmanThrowSnowballEvent.patch similarity index 96% rename from patches/api/0019-EMC-SnowmanThrowSnowballEvent.patch rename to patches/api/0018-EMC-SnowmanThrowSnowballEvent.patch index 6b1f0525..2f0d64b4 100644 --- a/patches/api/0019-EMC-SnowmanThrowSnowballEvent.patch +++ b/patches/api/0018-EMC-SnowmanThrowSnowballEvent.patch @@ -1,4 +1,4 @@ -From 5ebdae28ab2aeb880f1f96e16823900949e9370f Mon Sep 17 00:00:00 2001 +From 1b8ba0b95e9676bce55409a27118f962a7f8eeae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 20:28:24 -0500 Subject: [PATCH] EMC SnowmanThrowSnowballEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC SnowmanThrowSnowballEvent diff --git a/src/main/java/com/empireminecraft/customevents/SnowmanThrowSnowballEvent.java b/src/main/java/com/empireminecraft/customevents/SnowmanThrowSnowballEvent.java new file mode 100644 -index 00000000..53311062 +index 000000000..53311062e --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/SnowmanThrowSnowballEvent.java @@ -0,0 +1,63 @@ diff --git a/patches/api/0020-EMC-SendSignEvent.patch b/patches/api/0019-EMC-SendSignEvent.patch similarity index 96% rename from patches/api/0020-EMC-SendSignEvent.patch rename to patches/api/0019-EMC-SendSignEvent.patch index ef44afcb..7aba793a 100644 --- a/patches/api/0020-EMC-SendSignEvent.patch +++ b/patches/api/0019-EMC-SendSignEvent.patch @@ -1,4 +1,4 @@ -From dd584ed587c4e94396438ac311c98869a07c65b2 Mon Sep 17 00:00:00 2001 +From 85cf12fcd64cd4292a64d38fac486a91f18e4135 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 22:06:10 -0500 Subject: [PATCH] EMC SendSignEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC SendSignEvent 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 00000000..c5155915 +index 000000000..c51559156 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/SendSignEvent.java @@ -0,0 +1,45 @@ diff --git a/patches/api/0021-EMC-PlayerUseItemEvent.patch b/patches/api/0020-EMC-PlayerUseItemEvent.patch similarity index 98% rename from patches/api/0021-EMC-PlayerUseItemEvent.patch rename to patches/api/0020-EMC-PlayerUseItemEvent.patch index 5e4a96ac..33c59f62 100644 --- a/patches/api/0021-EMC-PlayerUseItemEvent.patch +++ b/patches/api/0020-EMC-PlayerUseItemEvent.patch @@ -1,4 +1,4 @@ -From a5d62d4af2c15e1f107eb5c10660d80ae025fca1 Mon Sep 17 00:00:00 2001 +From d5ce58a8e87b296ec9968807a148e8f7fc78737b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 7 Dec 2016 00:22:09 -0500 Subject: [PATCH] EMC PlayerUseItemEvent @@ -16,7 +16,7 @@ Subject: [PATCH] EMC PlayerUseItemEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostPlaceItemAtEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostPlaceItemAtEvent.java new file mode 100644 -index 00000000..8e83d0d9 +index 000000000..8e83d0d9a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostPlaceItemAtEvent.java @@ -0,0 +1,80 @@ @@ -102,7 +102,7 @@ index 00000000..8e83d0d9 +} diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostUseItemEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostUseItemEvent.java new file mode 100644 -index 00000000..511082ea +index 000000000..511082ea1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostUseItemEvent.java @@ -0,0 +1,69 @@ @@ -177,7 +177,7 @@ index 00000000..511082ea +} diff --git a/src/main/java/com/empireminecraft/customevents/PlayerPlaceItemAtEvent.java b/src/main/java/com/empireminecraft/customevents/PlayerPlaceItemAtEvent.java new file mode 100644 -index 00000000..1b1bf854 +index 000000000..1b1bf8546 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/PlayerPlaceItemAtEvent.java @@ -0,0 +1,110 @@ @@ -293,7 +293,7 @@ index 00000000..1b1bf854 +} diff --git a/src/main/java/com/empireminecraft/customevents/PlayerUseItemEvent.java b/src/main/java/com/empireminecraft/customevents/PlayerUseItemEvent.java new file mode 100644 -index 00000000..c61c6a44 +index 000000000..c61c6a44f --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/PlayerUseItemEvent.java @@ -0,0 +1,89 @@ diff --git a/patches/api/0022-EMC-EntityAttackedEntityEvent.patch b/patches/api/0021-EMC-EntityAttackedEntityEvent.patch similarity index 98% rename from patches/api/0022-EMC-EntityAttackedEntityEvent.patch rename to patches/api/0021-EMC-EntityAttackedEntityEvent.patch index 5a0e15ae..b9ea6f4e 100644 --- a/patches/api/0022-EMC-EntityAttackedEntityEvent.patch +++ b/patches/api/0021-EMC-EntityAttackedEntityEvent.patch @@ -1,4 +1,4 @@ -From 59d8bdc1098ed00ec4e15d5219412fce22126642 Mon Sep 17 00:00:00 2001 +From 30b791bc8c195f021024d231b0a05448cfb4e1f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 21:55:16 -0500 Subject: [PATCH] EMC EntityAttackedEntityEvent @@ -16,7 +16,7 @@ and that the damage event was not cancelled. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedEntityEvent.java new file mode 100644 -index 00000000..0f32f157 +index 000000000..0f32f157b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedEntityEvent.java @@ -0,0 +1,92 @@ @@ -114,7 +114,7 @@ index 00000000..0f32f157 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedPlayerEvent.java new file mode 100644 -index 00000000..8ce33f32 +index 000000000..8ce33f32d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAttackedPlayerEvent.java @@ -0,0 +1,40 @@ @@ -160,7 +160,7 @@ index 00000000..8ce33f32 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerAttackedEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerAttackedEntityEvent.java new file mode 100644 -index 00000000..134a7e02 +index 000000000..134a7e02d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerAttackedEntityEvent.java @@ -0,0 +1,41 @@ diff --git a/patches/api/0023-EMC-BlazeLaunchFireballEvent.patch b/patches/api/0022-EMC-BlazeLaunchFireballEvent.patch similarity index 96% rename from patches/api/0023-EMC-BlazeLaunchFireballEvent.patch rename to patches/api/0022-EMC-BlazeLaunchFireballEvent.patch index b5a810a1..a0a3405a 100644 --- a/patches/api/0023-EMC-BlazeLaunchFireballEvent.patch +++ b/patches/api/0022-EMC-BlazeLaunchFireballEvent.patch @@ -1,4 +1,4 @@ -From 4295ab274b34de7a26ab1f669cb190d091f0eb3e Mon Sep 17 00:00:00 2001 +From a1778b4f40e83debd9836b2191f5440132a7be7e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 May 2018 20:25:37 -0400 Subject: [PATCH] EMC BlazeLaunchFireballEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC BlazeLaunchFireballEvent diff --git a/src/main/java/com/empireminecraft/customevents/BlazeLaunchFireballEvent.java b/src/main/java/com/empireminecraft/customevents/BlazeLaunchFireballEvent.java new file mode 100644 -index 00000000..029a1f9a +index 000000000..029a1f9a1 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/BlazeLaunchFireballEvent.java @@ -0,0 +1,66 @@ diff --git a/patches/api/0024-EMC-Human-getAttackPct.patch b/patches/api/0023-EMC-Human-getAttackPct.patch similarity index 87% rename from patches/api/0024-EMC-Human-getAttackPct.patch rename to patches/api/0023-EMC-Human-getAttackPct.patch index cdc1a80f..3c3af37a 100644 --- a/patches/api/0024-EMC-Human-getAttackPct.patch +++ b/patches/api/0023-EMC-Human-getAttackPct.patch @@ -1,4 +1,4 @@ -From b7d5f5fd91ec6c3694274ddd80b3e02d9f08cfbc Mon Sep 17 00:00:00 2001 +From c131a44a6eef73197a6a1953adc55d4428444ab1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Jun 2018 02:08:40 -0400 Subject: [PATCH] EMC Human#getAttackPct @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Human#getAttackPct 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index f25c7315..26e0676d 100644 +index c0d38f5a3..70f046ce5 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -20,6 +20,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch b/patches/api/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch similarity index 95% rename from patches/api/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch rename to patches/api/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch index 03e1673d..c33ccab2 100644 --- a/patches/api/0025-EMC-SpawnEggMeta-setSpawnedEntity-API.patch +++ b/patches/api/0024-EMC-SpawnEggMeta-setSpawnedEntity-API.patch @@ -1,4 +1,4 @@ -From ea5c6f3effac81448223efd436bbb601c3b68aea Mon Sep 17 00:00:00 2001 +From 89b1a40836f5253e4f00f92c4e6d562d3bd902cd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 21:09:39 -0400 Subject: [PATCH] EMC SpawnEggMeta#setSpawnedEntity API @@ -11,7 +11,7 @@ follow normal spawn behavior in the summon phase. 1 file changed, 39 insertions(+) diff --git a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java -index 9ae84de4..f6ee31cd 100644 +index 9ae84de43..f6ee31cd6 100644 --- a/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SpawnEggMeta.java @@ -9,6 +9,45 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0026-EMC-Add-ConduitNewTargetEvent.patch b/patches/api/0025-EMC-Add-ConduitNewTargetEvent.patch similarity index 95% rename from patches/api/0026-EMC-Add-ConduitNewTargetEvent.patch rename to patches/api/0025-EMC-Add-ConduitNewTargetEvent.patch index 14cb5418..3074c938 100644 --- a/patches/api/0026-EMC-Add-ConduitNewTargetEvent.patch +++ b/patches/api/0025-EMC-Add-ConduitNewTargetEvent.patch @@ -1,4 +1,4 @@ -From 2bb9296d9afaaf35468b02144c6090359bc0eee1 Mon Sep 17 00:00:00 2001 +From f574c7d8d40084036ced9d39ae1c068b4a7a31e4 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Sun, 14 Jul 2019 13:50:18 -0500 Subject: [PATCH] EMC Add ConduitNewTargetEvent @@ -10,7 +10,7 @@ Subject: [PATCH] EMC Add ConduitNewTargetEvent diff --git a/src/main/java/com/empireminecraft/customevents/ConduitNewTargetEvent.java b/src/main/java/com/empireminecraft/customevents/ConduitNewTargetEvent.java new file mode 100644 -index 00000000..c3de31cf +index 000000000..c3de31cf5 --- /dev/null +++ b/src/main/java/com/empireminecraft/customevents/ConduitNewTargetEvent.java @@ -0,0 +1,39 @@ diff --git a/patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch b/patches/api/0026-EMC-Add-a-PlayerThrowTrident-event.patch similarity index 96% rename from patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch rename to patches/api/0026-EMC-Add-a-PlayerThrowTrident-event.patch index 27d4dea4..32d88ce2 100644 --- a/patches/api/0027-EMC-Add-a-PlayerThrowTrident-event.patch +++ b/patches/api/0026-EMC-Add-a-PlayerThrowTrident-event.patch @@ -1,4 +1,4 @@ -From bad232b6909250e81f97bc0e4c75d2d9d34d76db Mon Sep 17 00:00:00 2001 +From ca2a134df9a84d43f8c4ef127bf50aede812b358 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/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch b/patches/api/0027-EMC-Add-a-BlockHarvestBeehiveEvent.patch similarity index 97% rename from patches/api/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch rename to patches/api/0027-EMC-Add-a-BlockHarvestBeehiveEvent.patch index 2becd101..9a848fce 100644 --- a/patches/api/0028-EMC-Add-a-BlockHarvestBeehiveEvent.patch +++ b/patches/api/0027-EMC-Add-a-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From aa154abf4e044fe575ea78a064b02dc589a66b0a Mon Sep 17 00:00:00 2001 +From b9c9eece57661111616724185fe0c0e5b34e5f35 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/0029-Kill-AnnotationTest.patch b/patches/api/0028-Kill-AnnotationTest.patch similarity index 99% rename from patches/api/0029-Kill-AnnotationTest.patch rename to patches/api/0028-Kill-AnnotationTest.patch index 736e91ae..e9db2202 100644 --- a/patches/api/0029-Kill-AnnotationTest.patch +++ b/patches/api/0028-Kill-AnnotationTest.patch @@ -1,4 +1,4 @@ -From 458c5a023d29bec3d5f8170e84b6f18f46d4d9ff Mon Sep 17 00:00:00 2001 +From 192dedb044f9d228730febd2c8aeac0da0fcf64f 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/0030-Add-GameProfileLookupEvent.patch b/patches/api/0029-Add-GameProfileLookupEvent.patch similarity index 97% rename from patches/api/0030-Add-GameProfileLookupEvent.patch rename to patches/api/0029-Add-GameProfileLookupEvent.patch index 7ff1e440..d243fe4e 100644 --- a/patches/api/0030-Add-GameProfileLookupEvent.patch +++ b/patches/api/0029-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 2aab4c6ddfb3eb6b7e089e96e920ff89d0b5dc66 Mon Sep 17 00:00:00 2001 +From cf79beb447bd168ee90ca2f349b600e1f8f44acb 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/0031-Add-getLastTickMs-api.patch b/patches/api/0030-Add-getLastTickMs-api.patch similarity index 95% rename from patches/api/0031-Add-getLastTickMs-api.patch rename to patches/api/0030-Add-getLastTickMs-api.patch index 409f3673..5bbaaf28 100644 --- a/patches/api/0031-Add-getLastTickMs-api.patch +++ b/patches/api/0030-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 53ceaea3a6c3c4e9d9c7d3391b5d79c8b9e4a9b6 Mon Sep 17 00:00:00 2001 +From bb86d2fa9a4615aa87855e1ac1c9607e496fbd24 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/0032-Add-NBT-API-as-first-class-lib.patch b/patches/api/0031-Add-NBT-API-as-first-class-lib.patch similarity index 98% rename from patches/api/0032-Add-NBT-API-as-first-class-lib.patch rename to patches/api/0031-Add-NBT-API-as-first-class-lib.patch index 8ca7fe8c..ee39e830 100644 --- a/patches/api/0032-Add-NBT-API-as-first-class-lib.patch +++ b/patches/api/0031-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 01ec8ec840ab8820d9769cf0f4875c91b046af5b Mon Sep 17 00:00:00 2001 +From 47fd3448b181a10447b707ecac4cf9421da55b12 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/0033-EMC-Add-ChatColor.getById.patch b/patches/api/0032-EMC-Add-ChatColor.getById.patch similarity index 95% rename from patches/api/0033-EMC-Add-ChatColor.getById.patch rename to patches/api/0032-EMC-Add-ChatColor.getById.patch index a856ba89..43b82c3e 100644 --- a/patches/api/0033-EMC-Add-ChatColor.getById.patch +++ b/patches/api/0032-EMC-Add-ChatColor.getById.patch @@ -1,4 +1,4 @@ -From 41f38c79fb6a1154e65cfe587945a25352d2e45c Mon Sep 17 00:00:00 2001 +From 034cc6d131143f31aee7d722ab5e13d38ae7a2d0 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/0002-Brandings.patch b/patches/server/0002-Brandings.patch index d0bbb70d..1a3c2de1 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -1,4 +1,4 @@ -From 82a7a72b210e82f166cfbcc8b5f09842eba657f3 Mon Sep 17 00:00:00 2001 +From e9fbf5cbe9ed97ecf062439c9039149da0c9790a Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 18:37:34 +0100 Subject: [PATCH] Brandings @@ -53,10 +53,10 @@ index 0000000000..b7a73408ea +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1bf73ca92f..b228f4ca47 100644 +index 584f158aa0..5ae0227b9c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1613,7 +1613,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Jan 2014 22:05:59 -0500 Subject: [PATCH] EMC Disable Snooper @@ -9,10 +9,10 @@ What purpose does it provide... 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b228f4ca47..e1de3f7257 100644 +index 5ae0227b9c..0e2fd93e39 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1263,11 +1263,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 5 Sep 2014 23:04:54 -0400 Subject: [PATCH] EMC Accept the EULA @@ -9,10 +9,10 @@ Starlis LLC, the owner of Empire Minecraft, accepts the Minecraft EULA with this 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e1de3f7257..b1360c1b2c 100644 +index 0e2fd93e39..2df0919a15 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1472,6 +1472,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 8 Jun 2015 23:55:20 -0400 Subject: [PATCH] EMC SendSignEvent @@ -11,7 +11,7 @@ Subject: [PATCH] EMC SendSignEvent 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 00000000..9f3cb62f +index 0000000000..9f3cb62ffb --- /dev/null +++ b/src/main/java/com/empireminecraft/api/SendSignEventImpl.java @@ -0,0 +1,42 @@ @@ -58,7 +58,7 @@ index 00000000..9f3cb62f + } +} diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 0e9a90b7..6323fe55 100644 +index 0e9a90b70f..6323fe5594 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 { // diff --git a/patches/server/0020-EMC-ServerShutdownEvent-and-move-disablePlugins.patch b/patches/server/0020-EMC-ServerShutdownEvent-and-move-disablePlugins.patch deleted file mode 100644 index b3928633..00000000 --- a/patches/server/0020-EMC-ServerShutdownEvent-and-move-disablePlugins.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 567d1317da975eb4a4f63a3f0d4f29dd3e7648e7 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 8 May 2015 19:56:21 -0400 -Subject: [PATCH] EMC ServerShutdownEvent and move disablePlugins - ---- - src/main/java/net/minecraft/server/MinecraftServer.java | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f4a0104799..01c509dca0 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -99,6 +99,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 25 Jun 2015 21:00:09 -0400 Subject: [PATCH] EMC ServerReloadEvent @@ -8,7 +8,7 @@ Subject: [PATCH] EMC ServerReloadEvent 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 186986ee61..0d98264bda 100644 +index b281f05c4b..6838b0ed2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -780,6 +780,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch b/patches/server/0022-EMC-SnowmanThrowSnowballEvent.patch similarity index 97% rename from patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch rename to patches/server/0022-EMC-SnowmanThrowSnowballEvent.patch index 81de0e51..c4abea66 100644 --- a/patches/server/0023-EMC-SnowmanThrowSnowballEvent.patch +++ b/patches/server/0022-EMC-SnowmanThrowSnowballEvent.patch @@ -1,4 +1,4 @@ -From 3d5c18d3c3c7186870ac38e1bbb3f600e23160fa Mon Sep 17 00:00:00 2001 +From f5f5651fb06870655bb7245642b1dfce8d9e5c1c 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/0024-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0023-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 91% rename from patches/server/0024-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0023-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch index 7972e5a5..704a8ba7 100644 --- a/patches/server/0024-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch +++ b/patches/server/0023-EMC-Reset-Ender-Crystals-on-Dragon-Spawn.patch @@ -1,4 +1,4 @@ -From 7f7e7d2b522b9b5bb608b5c0c858b9624437b2de Mon Sep 17 00:00:00 2001 +From fd14f5382adf6ac8b3a7c9c437ab583c01be6a39 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 @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Reset Ender Crystals on Dragon Spawn 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index 218c0424..951d1832 100644 +index 687efa022d..2617a6c0d9 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -403,6 +403,7 @@ public class EnderDragonBattle { diff --git a/patches/server/0025-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/patches/server/0024-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 89% rename from patches/server/0025-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to patches/server/0024-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch index c80d66e2..760d803a 100644 --- a/patches/server/0025-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch +++ b/patches/server/0024-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch @@ -1,4 +1,4 @@ -From fb8436bfb388c5aedd3454ad8215eac81ae00816 Mon Sep 17 00:00:00 2001 +From 4256de92773deb71ec3259bfa38c3fa00364b21f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 7 Nov 2017 00:01:04 -0500 Subject: [PATCH] EMC Don't use snapshots for TileEntity::getOwner @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Don't use snapshots for TileEntity::getOwner 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index a8e64dfd..d4556abd 100644 +index a8e64dfdab..d4556abda3 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -235,7 +235,7 @@ public abstract class TileEntity implements KeyedObject { // Paper diff --git a/patches/server/0026-EMC-EntityAttackedEntityEvent.patch b/patches/server/0025-EMC-EntityAttackedEntityEvent.patch similarity index 95% rename from patches/server/0026-EMC-EntityAttackedEntityEvent.patch rename to patches/server/0025-EMC-EntityAttackedEntityEvent.patch index 3db12710..6e86d236 100644 --- a/patches/server/0026-EMC-EntityAttackedEntityEvent.patch +++ b/patches/server/0025-EMC-EntityAttackedEntityEvent.patch @@ -1,4 +1,4 @@ -From 8d7b52f72d216de0f5323929c6d551a317186cff Mon Sep 17 00:00:00 2001 +From 07ebd788422b6aa43c954fdc80b5effeb8c6b9b5 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/0027-EMC-Human-getAttackPct.patch b/patches/server/0026-EMC-Human-getAttackPct.patch similarity index 92% rename from patches/server/0027-EMC-Human-getAttackPct.patch rename to patches/server/0026-EMC-Human-getAttackPct.patch index 7afc300f..f680a712 100644 --- a/patches/server/0027-EMC-Human-getAttackPct.patch +++ b/patches/server/0026-EMC-Human-getAttackPct.patch @@ -1,4 +1,4 @@ -From 1a23964ea3c6da981ec95c5f5104eb1004568213 Mon Sep 17 00:00:00 2001 +From bca937537fb4b1a7d8f4e6bd16e36f0e1920a170 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Jun 2018 02:09:37 -0400 Subject: [PATCH] EMC Human#getAttackPct @@ -9,7 +9,7 @@ Subject: [PATCH] EMC Human#getAttackPct 2 files changed, 4 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 59408cfd0..2a8eb7939 100644 +index 8f4bb71b16..c1e8ff6ab3 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -79,6 +79,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -29,7 +29,7 @@ index 59408cfd0..2a8eb7939 100644 f *= 0.2F + f2 * f2 * 0.8F; f1 *= f2; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 1c88eacea..5dfa8eb79 100644 +index a2815073bc..faa65ef202 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -72,6 +72,8 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0028-EMC-Tweak-Explosions.patch b/patches/server/0027-EMC-Tweak-Explosions.patch similarity index 95% rename from patches/server/0028-EMC-Tweak-Explosions.patch rename to patches/server/0027-EMC-Tweak-Explosions.patch index c155960b..4a7e926d 100644 --- a/patches/server/0028-EMC-Tweak-Explosions.patch +++ b/patches/server/0027-EMC-Tweak-Explosions.patch @@ -1,4 +1,4 @@ -From 98858d2ce483f4a2e84896fcd68dc18af00a90c8 Mon Sep 17 00:00:00 2001 +From 75af9109ba0b24b59be3d8f2223bd99952b9c18b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 22:35:39 -0400 Subject: [PATCH] EMC Tweak Explosions @@ -8,7 +8,7 @@ Subject: [PATCH] EMC Tweak Explosions 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index a353f3d5..b1ac7d10 100644 +index a353f3d5fa..b1ac7d1046 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -97,6 +97,7 @@ public class Explosion { diff --git a/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0028-EMC-Default-don-t-use-blockstate-snapshots.patch similarity index 93% rename from patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch rename to patches/server/0028-EMC-Default-don-t-use-blockstate-snapshots.patch index 960daec2..35de2cf3 100644 --- a/patches/server/0029-EMC-Default-don-t-use-blockstate-snapshots.patch +++ b/patches/server/0028-EMC-Default-don-t-use-blockstate-snapshots.patch @@ -1,4 +1,4 @@ -From eaac0ed4866c7943e2c0dab6c9c5656efb6fafa0 Mon Sep 17 00:00:00 2001 +From ce3312e104db3ffb8a09fdb5b59a7507f72a8c0c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Jun 2018 22:13:44 -0400 Subject: [PATCH] EMC Default don't use blockstate snapshots diff --git a/patches/server/0030-EMC-SpawnEggMeta-setSpawnedEntity-API.patch b/patches/server/0029-EMC-SpawnEggMeta-setSpawnedEntity-API.patch similarity index 96% rename from patches/server/0030-EMC-SpawnEggMeta-setSpawnedEntity-API.patch rename to patches/server/0029-EMC-SpawnEggMeta-setSpawnedEntity-API.patch index a723d6fd..3f70d615 100644 --- a/patches/server/0030-EMC-SpawnEggMeta-setSpawnedEntity-API.patch +++ b/patches/server/0029-EMC-SpawnEggMeta-setSpawnedEntity-API.patch @@ -1,4 +1,4 @@ -From 8efa71d06b838c20b3072cb181d9baca073747c9 Mon Sep 17 00:00:00 2001 +From 6ff31b66f16ac97cbe86dbe84c4ebeb87eda7e3a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 22:03:33 -0400 Subject: [PATCH] EMC SpawnEggMeta#setSpawnedEntity API @@ -11,7 +11,7 @@ follow normal spawn behavior in the summon phase. 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java -index 0634fb36..24ac98e4 100644 +index 0634fb36dd..24ac98e4d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java @@ -2,6 +2,9 @@ package org.bukkit.craftbukkit.inventory; diff --git a/patches/server/0031-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch b/patches/server/0030-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch similarity index 95% rename from patches/server/0031-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch rename to patches/server/0030-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch index d492967c..f365d320 100644 --- a/patches/server/0031-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch +++ b/patches/server/0030-EMC-ConduitNewTargetEvent-and-remove-target-for-canc.patch @@ -1,4 +1,4 @@ -From 0e2d2f494498668839dce1edbe436ae08ec6b85d Mon Sep 17 00:00:00 2001 +From e74ce5e0eb7475aa6b56931767d7b14f50d98e6b 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 @@ -9,7 +9,7 @@ Subject: [PATCH] EMC ConduitNewTargetEvent and remove target for cancelled 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/TileEntityConduit.java b/src/main/java/net/minecraft/server/TileEntityConduit.java -index 07f265b2..b6ad68fc 100644 +index 07f265b299..b6ad68fcbf 100644 --- a/src/main/java/net/minecraft/server/TileEntityConduit.java +++ b/src/main/java/net/minecraft/server/TileEntityConduit.java @@ -182,7 +182,14 @@ public class TileEntityConduit extends TileEntity implements ITickable { diff --git a/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch b/patches/server/0031-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch similarity index 97% rename from patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch rename to patches/server/0031-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch index ee0ca031..e071305c 100644 --- a/patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch +++ b/patches/server/0031-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch @@ -1,4 +1,4 @@ -From 0ca9a13cafff2b942eb4273cfa024e13bee7dbaa Mon Sep 17 00:00:00 2001 +From 92214895f7b09ad7701e8327f8871247b91addc3 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 @@ -95,7 +95,7 @@ index 6c2b48bdbe..ab1c15e0d1 100644 if (this.world != null) BlockLectern.a(this.getWorld(), this.getPosition(), this.getBlock()); // CraftBukkit } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 63521e8d22..a774968a13 100644 +index faa65ef202..74b9c45162 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -31,6 +31,7 @@ import net.minecraft.server.PacketPlayInCloseWindow; @@ -106,7 +106,7 @@ index 63521e8d22..a774968a13 100644 import net.minecraft.server.Vec3D; import org.bukkit.GameMode; import org.bukkit.Location; -@@ -317,6 +318,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -328,6 +329,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { if (craft.getInventory() instanceof ITileInventory) { iinventory = (ITileInventory) craft.getInventory(); } diff --git a/patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch b/patches/server/0032-EMC-Add-the-PlayerThrowTridentEvent.patch similarity index 95% rename from patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch rename to patches/server/0032-EMC-Add-the-PlayerThrowTridentEvent.patch index 247c6ca1..3ef9073c 100644 --- a/patches/server/0033-EMC-Add-the-PlayerThrowTridentEvent.patch +++ b/patches/server/0032-EMC-Add-the-PlayerThrowTridentEvent.patch @@ -1,4 +1,4 @@ -From 426a642033eba18a8717dfec47cd4295ec7e26a7 Mon Sep 17 00:00:00 2001 +From 2fa8321d0d75158c8b9336f2d3d347879b317727 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/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch b/patches/server/0033-EMC-Add-the-BlockHarvestBeehiveEvent.patch similarity index 96% rename from patches/server/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch rename to patches/server/0033-EMC-Add-the-BlockHarvestBeehiveEvent.patch index fdb369c7..34f448bd 100644 --- a/patches/server/0034-EMC-Add-the-BlockHarvestBeehiveEvent.patch +++ b/patches/server/0033-EMC-Add-the-BlockHarvestBeehiveEvent.patch @@ -1,4 +1,4 @@ -From c3407c27ef59f4414f5ca7b393430119132ca10b Mon Sep 17 00:00:00 2001 +From 94efa383cb5be7a2bbe2eacf487aac8b67587710 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/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch b/patches/server/0034-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch similarity index 94% rename from patches/server/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch rename to patches/server/0034-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch index 7cebaa87..665a21d0 100644 --- a/patches/server/0035-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch +++ b/patches/server/0034-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch @@ -1,4 +1,4 @@ -From b722c33c099acbb4a9deb8343639a781adfa1e3e Mon Sep 17 00:00:00 2001 +From 5982d5de2db57e10a4e1ba841744c2001bf9b247 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/0036-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0035-Don-t-save-Fireworks-and-Arrows.patch similarity index 84% rename from patches/server/0036-Don-t-save-Fireworks-and-Arrows.patch rename to patches/server/0035-Don-t-save-Fireworks-and-Arrows.patch index 08884957..b755f0ee 100644 --- a/patches/server/0036-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0035-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From 07ccf6a036ae9ee1bce447c3cd347793ea68e764 Mon Sep 17 00:00:00 2001 +From 0d7f71417945341c30a23baad0a23ad0d4c1b3b5 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 @@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2f7c78e2b4..153a87ffa0 100644 +index 0876c84025..89cbeb0b65 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1614,7 +1614,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1616,7 +1616,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean c(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0037-Add-GameProfileLookupEvent.patch b/patches/server/0036-Add-GameProfileLookupEvent.patch similarity index 98% rename from patches/server/0037-Add-GameProfileLookupEvent.patch rename to patches/server/0036-Add-GameProfileLookupEvent.patch index ed36eaa2..f759d81d 100644 --- a/patches/server/0037-Add-GameProfileLookupEvent.patch +++ b/patches/server/0036-Add-GameProfileLookupEvent.patch @@ -1,4 +1,4 @@ -From 25d157fb08edec4ed3dd94c403bc9f2b7773c926 Mon Sep 17 00:00:00 2001 +From f32b6557c3f7c449678dc08833f6651a652734d2 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/0038-Add-getLastTickMs-api.patch b/patches/server/0037-Add-getLastTickMs-api.patch similarity index 89% rename from patches/server/0038-Add-getLastTickMs-api.patch rename to patches/server/0037-Add-getLastTickMs-api.patch index 94dd2f29..cc54776d 100644 --- a/patches/server/0038-Add-getLastTickMs-api.patch +++ b/patches/server/0037-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 1523e20cc6f7f2f0230303851e2d5a364504e118 Mon Sep 17 00:00:00 2001 +From 12d3dca1b22c1badf12ff7b9bec4c66686adbfa3 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -10,10 +10,10 @@ Subject: [PATCH] Add getLastTickMs() api 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b9c9bf0387..0aca5993ec 100644 +index 2df0919a15..6f09157927 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -893,6 +893,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -7,9 +7,9 @@ Subject: [PATCH] Add config, yapfa command and basic settings .../java/de/tr7zw/yapfa/YapfaCommand.java | 129 +++++++++++ src/main/java/de/tr7zw/yapfa/YapfaConfig.java | 219 ++++++++++++++++++ .../net/minecraft/server/DedicatedServer.java | 9 + - .../java/net/minecraft/server/Entity.java | 4 +- + .../java/net/minecraft/server/Entity.java | 7 +- .../net/minecraft/server/EntityLiving.java | 4 + - 5 files changed, 364 insertions(+), 1 deletion(-) + 5 files changed, 365 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaCommand.java create mode 100644 src/main/java/de/tr7zw/yapfa/YapfaConfig.java @@ -376,7 +376,7 @@ index 0000000000..9711cbc522 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 3c8e231c6a..a2864c9534 100644 +index c95e1722ac..7297f87189 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -194,6 +194,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -396,10 +396,10 @@ index 3c8e231c6a..a2864c9534 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 72a0c776f4..ddb82ef5be 100644 +index 89cbeb0b65..29cc192682 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -753,6 +753,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -754,6 +754,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke try { this.inLava = false; @@ -407,13 +407,15 @@ index 72a0c776f4..ddb82ef5be 100644 this.checkBlockCollisions(); } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision"); -@@ -882,8 +883,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -883,9 +884,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke private Vec3D e(Vec3D vec3d) { AxisAlignedBB axisalignedbb = this.getBoundingBox(); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); -+ - Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Tuinity - optimise voxelshapes +- VoxelShape voxelshape = this.world.getWorldBorder().a(); +- Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Paper - Stream stream1 = this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); ++ ++ Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(this.world.getWorldBorder().a()); // Tuinity - optimise voxelshapes + Stream stream1 = de.tr7zw.yapfa.YapfaConfig.disableEntityCollisionboxes ? Stream.empty() : this.world.b(this, axisalignedbb.a(vec3d), (Set) ImmutableSet.of()); // YAPFA StreamAccumulator streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream)); Vec3D vec3d1 = vec3d.g() == 0.0D ? vec3d : a(this, vec3d, axisalignedbb, this.world, voxelshapecollision, streamaccumulator); diff --git a/patches/server/0040-Kill-the-vanilla-GameProfiler.patch b/patches/server/0039-Kill-the-vanilla-GameProfiler.patch similarity index 94% rename from patches/server/0040-Kill-the-vanilla-GameProfiler.patch rename to patches/server/0039-Kill-the-vanilla-GameProfiler.patch index 5abac83c..2384a011 100644 --- a/patches/server/0040-Kill-the-vanilla-GameProfiler.patch +++ b/patches/server/0039-Kill-the-vanilla-GameProfiler.patch @@ -1,4 +1,4 @@ -From 88c17335e67af3543480560b01fa0a8a9ac43fa1 Mon Sep 17 00:00:00 2001 +From bd64dbe02e0fc24e40a6a2fc453dd0d1bc21fa82 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] Kill the vanilla "GameProfiler" @@ -67,7 +67,7 @@ index 0000000000..96a2270a81 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0aca5993ec..5bcc38fd02 100644 +index 6f09157927..493d2dd31c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 23 Mar 2020 18:20:58 +0100 Subject: [PATCH] Remove Stream usage @@ -158,7 +158,7 @@ index e40375b67a..2a5574be3a 100644 entity.enderTeleportTo(entity.locX(), entity.locY() + 1.0D + d0, entity.locZ()); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 58ba120915..46668693ef 100644 +index 3bf17ccdae..67f95a9a6e 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -72,7 +72,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -269,7 +269,7 @@ index f0d7a91fa0..15e2439d69 100644 public Stream c() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7a4bb21f05..d91f20d989 100644 +index 29cc192682..4805dc1ee9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -13,6 +13,7 @@ import java.util.Locale; @@ -280,7 +280,7 @@ index 7a4bb21f05..d91f20d989 100644 import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -@@ -883,31 +884,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -884,31 +885,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke private Vec3D e(Vec3D vec3d) { AxisAlignedBB axisalignedbb = this.getBoundingBox(); VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); @@ -356,7 +356,7 @@ index 7a4bb21f05..d91f20d989 100644 } return vec3d1; -@@ -930,6 +960,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -931,6 +961,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator); } } diff --git a/patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch b/patches/server/0041-Add-option-for-only-players-to-have-collisions-with-.patch similarity index 97% rename from patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch rename to patches/server/0041-Add-option-for-only-players-to-have-collisions-with-.patch index 4ca4bfa5..a8f3be1e 100644 --- a/patches/server/0043-Add-option-for-only-players-to-have-collisions-with-.patch +++ b/patches/server/0041-Add-option-for-only-players-to-have-collisions-with-.patch @@ -1,4 +1,4 @@ -From 1068bddd31508845d6c0e371d80b505cec8324a8 Mon Sep 17 00:00:00 2001 +From 6ff953e53783337467175b27d9b311a3f5101918 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/0041-Rewrite-Pathfinder-to-not-use-Streams.patch b/patches/server/0041-Rewrite-Pathfinder-to-not-use-Streams.patch deleted file mode 100644 index 10dedaa8..00000000 --- a/patches/server/0041-Rewrite-Pathfinder-to-not-use-Streams.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 1b270ca71b945a41b859afaf51b384ed50752bd3 Mon Sep 17 00:00:00 2001 -From: tr7zw -Date: Sun, 22 Mar 2020 19:12:07 +0100 -Subject: [PATCH] Rewrite Pathfinder to not use Streams - ---- - .../java/net/minecraft/server/Pathfinder.java | 48 +++++++++++++++++-- - 1 file changed, 45 insertions(+), 3 deletions(-) - -diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 67c63cfe33..b0fa7dbf71 100644 ---- a/src/main/java/net/minecraft/server/Pathfinder.java -+++ b/src/main/java/net/minecraft/server/Pathfinder.java -@@ -2,7 +2,6 @@ package net.minecraft.server; - - import com.google.common.collect.Lists; - import com.google.common.collect.Sets; --import java.util.Comparator; - import java.util.Iterator; - import java.util.List; - import java.util.Map; -@@ -10,7 +9,6 @@ import java.util.Optional; - import java.util.Set; - import java.util.function.Function; - import java.util.stream.Collectors; --import java.util.stream.Stream; - import javax.annotation.Nullable; - - public class Pathfinder { -@@ -94,6 +92,48 @@ public class Pathfinder { - } - } - -+ // YAPFA start -+ -+ boolean anyMatch = false; -+ for(PathDestination path : set) { -+ if(path.f()) { -+ anyMatch = true; -+ break; -+ } -+ } -+ PathEntity lowest = null; -+ if(anyMatch) { -+ for(PathDestination path : set) { -+ if(path.f()) { -+ if(lowest == null) { -+ lowest = this.a(path.d(), (BlockPosition) map.get(path), true); -+ }else { -+ PathEntity dest = this.a(path.d(), (BlockPosition) map.get(path), true); -+ if(dest.e() < lowest.e()) { -+ lowest = dest; -+ } -+ } -+ } -+ } -+ } else { -+ for(PathDestination path : set) { -+ if(path.f()) { -+ if(lowest == null) { -+ lowest = this.a(path.d(), (BlockPosition) map.get(path), false); -+ }else { -+ PathEntity dest = this.a(path.d(), (BlockPosition) map.get(path), false); -+ if(dest.l() < lowest.l()) { -+ lowest = dest; -+ }else if(dest.l() == lowest.l() && dest.e() < lowest.e()) { -+ lowest = dest; -+ } -+ } -+ } -+ } -+ } -+ -+ Optional optional = Optional.ofNullable(lowest); -+ /* - Stream stream; - - if (set.stream().anyMatch(PathDestination::f)) { -@@ -107,7 +147,9 @@ public class Pathfinder { - } - - Optional optional = stream.findFirst(); -- -+ */ -+ // YAPFA end -+ - if (!optional.isPresent()) { - return null; - } else { --- -2.25.1.windows.1 - diff --git a/patches/server/0044-Allow-to-change-the-piston-push-limit.patch b/patches/server/0042-Allow-to-change-the-piston-push-limit.patch similarity index 97% rename from patches/server/0044-Allow-to-change-the-piston-push-limit.patch rename to patches/server/0042-Allow-to-change-the-piston-push-limit.patch index 6190daaa..a8862bf9 100644 --- a/patches/server/0044-Allow-to-change-the-piston-push-limit.patch +++ b/patches/server/0042-Allow-to-change-the-piston-push-limit.patch @@ -1,4 +1,4 @@ -From b80888f31bf792b7a9e69f725e08d330fc64c04e Mon Sep 17 00:00:00 2001 +From bb916770becddaf8437b77602514a80593774845 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/0045-Add-option-for-pushable-TileEntities.patch b/patches/server/0043-Add-option-for-pushable-TileEntities.patch similarity index 99% rename from patches/server/0045-Add-option-for-pushable-TileEntities.patch rename to patches/server/0043-Add-option-for-pushable-TileEntities.patch index 7ae5b784..c2429e37 100644 --- a/patches/server/0045-Add-option-for-pushable-TileEntities.patch +++ b/patches/server/0043-Add-option-for-pushable-TileEntities.patch @@ -1,4 +1,4 @@ -From c77eb0f5ad7306cc6575de580cfd3897fd874106 Mon Sep 17 00:00:00 2001 +From 18a2b1246a7bb841fc66eaea38905cc93c067af9 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sun, 29 Mar 2020 01:59:27 +0100 Subject: [PATCH] Add option for pushable TileEntities @@ -669,7 +669,7 @@ index 0000000000..b32f231981 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 132c5e7dfb..e1de2edd02 100644 +index 25c8e55b81..481732b0c5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -275,6 +275,13 @@ public class WorldServer extends World { diff --git a/patches/server/0046-Add-NBT-API-as-first-class-lib.patch b/patches/server/0044-Add-NBT-API-as-first-class-lib.patch similarity index 93% rename from patches/server/0046-Add-NBT-API-as-first-class-lib.patch rename to patches/server/0044-Add-NBT-API-as-first-class-lib.patch index ab91bdbb..c85ebb9f 100644 --- a/patches/server/0046-Add-NBT-API-as-first-class-lib.patch +++ b/patches/server/0044-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From 6ba01205e8f94a71220c99171c4c93033f956003 Mon Sep 17 00:00:00 2001 +From bad2b635daeb98aa074caadb7059f768dc6e14c9 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/0047-Player-saving-async-FileIO.patch b/patches/server/0045-Player-saving-async-FileIO.patch similarity index 99% rename from patches/server/0047-Player-saving-async-FileIO.patch rename to patches/server/0045-Player-saving-async-FileIO.patch index 0e82552e..f5a4ce22 100644 --- a/patches/server/0047-Player-saving-async-FileIO.patch +++ b/patches/server/0045-Player-saving-async-FileIO.patch @@ -1,4 +1,4 @@ -From f26762de38c0f91772aca3ff854a56c280001b6d Mon Sep 17 00:00:00 2001 +From f01e33b76b15ed8f57bb2417804ec9ebf151a4db Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 4 Apr 2020 23:23:04 +0200 Subject: [PATCH] Player saving async FileIO @@ -183,7 +183,7 @@ index c1e8ff6ab3..db4f628830 100644 nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index bcf95c4bb0..f50f844473 100644 +index d1533a8265..38e7fa8c65 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -16,6 +16,8 @@ import java.util.Map; diff --git a/patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch b/patches/server/0046-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch similarity index 98% rename from patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch rename to patches/server/0046-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch index 98ca53fb..35e1f26f 100644 --- a/patches/server/0048-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch +++ b/patches/server/0046-Stop-a-pathfinder-method-to-call-itself-more-than-on.patch @@ -1,4 +1,4 @@ -From 28c06fe583768a03cb7782b358ec1c0b1876eece Mon Sep 17 00:00:00 2001 +From dc672cf0886f227c45b5232c7cd3f60550ab6b62 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/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch b/patches/server/0047-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch similarity index 96% rename from patches/server/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch rename to patches/server/0047-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch index e9e08030..db34391d 100644 --- a/patches/server/0049-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch +++ b/patches/server/0047-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch @@ -1,4 +1,4 @@ -From 3c3fb4282e51c01730c41b89ec788470b2beac9d Mon Sep 17 00:00:00 2001 +From 9fc45d5b7a0ef41862f36cf253dc4dd6dc949dfd 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/0050-Akarin-Save-json-list-async.patch b/patches/server/0048-Akarin-Save-json-list-async.patch similarity index 96% rename from patches/server/0050-Akarin-Save-json-list-async.patch rename to patches/server/0048-Akarin-Save-json-list-async.patch index 06fced51..456de884 100644 --- a/patches/server/0050-Akarin-Save-json-list-async.patch +++ b/patches/server/0048-Akarin-Save-json-list-async.patch @@ -1,4 +1,4 @@ -From 50a7b4fd80a032af2d0c93d25173f415f213e43c Mon Sep 17 00:00:00 2001 +From ec3876e3dc14b1fe2c10a18b5f6efcb8b247b266 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/0051-Akarin-Optimize-door-interact-with-pathfinding.patch b/patches/server/0049-Akarin-Optimize-door-interact-with-pathfinding.patch similarity index 99% rename from patches/server/0051-Akarin-Optimize-door-interact-with-pathfinding.patch rename to patches/server/0049-Akarin-Optimize-door-interact-with-pathfinding.patch index d4543d49..a7dd0f62 100644 --- a/patches/server/0051-Akarin-Optimize-door-interact-with-pathfinding.patch +++ b/patches/server/0049-Akarin-Optimize-door-interact-with-pathfinding.patch @@ -1,4 +1,4 @@ -From 7f8814d44da724648b530f8cc5d05be677732ece Mon Sep 17 00:00:00 2001 +From f2abd86c3222499bceb0bb68a944f10769dbbafe 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/0052-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch b/patches/server/0050-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch similarity index 96% rename from patches/server/0052-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch rename to patches/server/0050-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch index d4f15e36..cef52d16 100644 --- a/patches/server/0052-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch +++ b/patches/server/0050-Purpur-MC-125757-Fix-Always-increment-arrow-despawn-.patch @@ -1,4 +1,4 @@ -From 351024244f10e93aef27810fccd4f84f6dabc58c Mon Sep 17 00:00:00 2001 +From 70c2a32371ed55e8f80d54ae41a7ba4b4deed4a4 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/0053-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0051-Purpur-Skip-events-if-there-s-no-listeners.patch similarity index 96% rename from patches/server/0053-Purpur-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0051-Purpur-Skip-events-if-there-s-no-listeners.patch index 8c879eee..34ab7641 100644 --- a/patches/server/0053-Purpur-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0051-Purpur-Skip-events-if-there-s-no-listeners.patch @@ -1,4 +1,4 @@ -From 4c512006f8a8f54f804cf459e3ddbcb95adff7ec Mon Sep 17 00:00:00 2001 +From fe73677acb700b0eeae03e1223d933c20c078113 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/0054-Purpur-Add-more-timings-timers.patch b/patches/server/0052-Purpur-Add-more-timings-timers.patch similarity index 99% rename from patches/server/0054-Purpur-Add-more-timings-timers.patch rename to patches/server/0052-Purpur-Add-more-timings-timers.patch index b923d6b5..ad52de08 100644 --- a/patches/server/0054-Purpur-Add-more-timings-timers.patch +++ b/patches/server/0052-Purpur-Add-more-timings-timers.patch @@ -1,4 +1,4 @@ -From e72ae11add27505bd4dc784eda716fc6276d0896 Mon Sep 17 00:00:00 2001 +From 2f0e8910b0d230789b390a0099a10d08126375a6 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/0055-Modify-default-configs.patch b/patches/server/0053-Modify-default-configs.patch similarity index 96% rename from patches/server/0055-Modify-default-configs.patch rename to patches/server/0053-Modify-default-configs.patch index 02307681..335d3521 100644 --- a/patches/server/0055-Modify-default-configs.patch +++ b/patches/server/0053-Modify-default-configs.patch @@ -1,4 +1,4 @@ -From 86c737cf314ac4634345105dcd2e6ca0258e6edc Mon Sep 17 00:00:00 2001 +From 2a952a3a39338813dcfb20c3cae41d1ee1b7e6ae 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/0056-lithium-MixinDirection.patch b/patches/server/0054-lithium-MixinDirection.patch similarity index 97% rename from patches/server/0056-lithium-MixinDirection.patch rename to patches/server/0054-lithium-MixinDirection.patch index f1fadaab..aace60b0 100644 --- a/patches/server/0056-lithium-MixinDirection.patch +++ b/patches/server/0054-lithium-MixinDirection.patch @@ -1,4 +1,4 @@ -From d11412bce648de5b88ce3000dcea73eb43832e37 Mon Sep 17 00:00:00 2001 +From 8c250fb50e8f1ee575effd766e770913eb266e3b 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/0057-lithium-MixinBox.patch b/patches/server/0055-lithium-MixinBox.patch similarity index 96% rename from patches/server/0057-lithium-MixinBox.patch rename to patches/server/0055-lithium-MixinBox.patch index 5608e645..82c27517 100644 --- a/patches/server/0057-lithium-MixinBox.patch +++ b/patches/server/0055-lithium-MixinBox.patch @@ -1,4 +1,4 @@ -From 87a38accd2a1507f943d2c6b781440e3dd1542c9 Mon Sep 17 00:00:00 2001 +From 5501981793c592eaa22a93700472a2f5b3764e59 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/0058-lithium-enum_values.patch b/patches/server/0056-lithium-enum_values.patch similarity index 98% rename from patches/server/0058-lithium-enum_values.patch rename to patches/server/0056-lithium-enum_values.patch index bffeec80..e2bb4c2a 100644 --- a/patches/server/0058-lithium-enum_values.patch +++ b/patches/server/0056-lithium-enum_values.patch @@ -1,4 +1,4 @@ -From 8ef9f043a50be120feab0553f2dcb9b06d1ea68d Mon Sep 17 00:00:00 2001 +From 04c4b6ba0f9eda0cf796318b5cb2aa1375d11d27 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/0059-lithium-MixinAxisCycleDirection.patch b/patches/server/0057-lithium-MixinAxisCycleDirection.patch similarity index 98% rename from patches/server/0059-lithium-MixinAxisCycleDirection.patch rename to patches/server/0057-lithium-MixinAxisCycleDirection.patch index ac6b508b..e8b11b91 100644 --- a/patches/server/0059-lithium-MixinAxisCycleDirection.patch +++ b/patches/server/0057-lithium-MixinAxisCycleDirection.patch @@ -1,4 +1,4 @@ -From f04932298fd0fb77288d350db7f7a7f9711df4d5 Mon Sep 17 00:00:00 2001 +From 0751f2585288252e34003a80e48c147b973b297d 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/0060-lithium-MixinGoalSelector.patch b/patches/server/0058-lithium-MixinGoalSelector.patch similarity index 97% rename from patches/server/0060-lithium-MixinGoalSelector.patch rename to patches/server/0058-lithium-MixinGoalSelector.patch index a3069d21..bc1367f7 100644 --- a/patches/server/0060-lithium-MixinGoalSelector.patch +++ b/patches/server/0058-lithium-MixinGoalSelector.patch @@ -1,4 +1,4 @@ -From 37779f7ee42ebdd5b892d3a592d5f553473b9a68 Mon Sep 17 00:00:00 2001 +From 3b289f53627f048a0575dfc71fb31a811361a656 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/0061-lithium-MixinLandPathNodeMaker.patch b/patches/server/0059-lithium-MixinLandPathNodeMaker.patch similarity index 98% rename from patches/server/0061-lithium-MixinLandPathNodeMaker.patch rename to patches/server/0059-lithium-MixinLandPathNodeMaker.patch index 852e54e1..1248c972 100644 --- a/patches/server/0061-lithium-MixinLandPathNodeMaker.patch +++ b/patches/server/0059-lithium-MixinLandPathNodeMaker.patch @@ -1,4 +1,4 @@ -From d6039bd7ba6a4d385054a6f33c28edb071bb77b6 Mon Sep 17 00:00:00 2001 +From bbddfec12caa76a8eee32b9fc41c743807f90b50 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/0062-lithium-MixinBiome.patch b/patches/server/0060-lithium-MixinBiome.patch similarity index 98% rename from patches/server/0062-lithium-MixinBiome.patch rename to patches/server/0060-lithium-MixinBiome.patch index ade97178..43f7df67 100644 --- a/patches/server/0062-lithium-MixinBiome.patch +++ b/patches/server/0060-lithium-MixinBiome.patch @@ -1,4 +1,4 @@ -From 22244fafbba91c17c619f5f1b457240e8c36c46e Mon Sep 17 00:00:00 2001 +From 0121c794a146f90e79a25faa581716d0de6af99e 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/0063-lithium-MixinTypeFilterableList.patch b/patches/server/0061-lithium-MixinTypeFilterableList.patch similarity index 98% rename from patches/server/0063-lithium-MixinTypeFilterableList.patch rename to patches/server/0061-lithium-MixinTypeFilterableList.patch index e7a8549b..1de44897 100644 --- a/patches/server/0063-lithium-MixinTypeFilterableList.patch +++ b/patches/server/0061-lithium-MixinTypeFilterableList.patch @@ -1,4 +1,4 @@ -From 1882f68ff6efa1ced7ff3c387411c4060600389b Mon Sep 17 00:00:00 2001 +From 0534c55d0640a33f2837d74b52df33a4c0003dd9 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Tue, 12 May 2020 01:16:14 +0200 Subject: [PATCH] lithium MixinTypeFilterableList