diff --git a/patches/server/0124-Player-invulnerabilities.patch b/patches/server/0113-Player-invulnerabilities.patch similarity index 97% rename from patches/server/0124-Player-invulnerabilities.patch rename to patches/server/0113-Player-invulnerabilities.patch index 16c3a99c1..db014f1fb 100644 --- a/patches/server/0124-Player-invulnerabilities.patch +++ b/patches/server/0113-Player-invulnerabilities.patch @@ -1,4 +1,4 @@ -From 4692fd99f07ec237c162c84fb54ba85e3662cff5 Mon Sep 17 00:00:00 2001 +From 94e476eb077f2094206185c6d9b0007d713d4b99 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:44 -0500 Subject: [PATCH] Player invulnerabilities @@ -100,10 +100,10 @@ index 642160065..5e15eb46e 100644 return entityplayer1; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2a81fed03..f2281d325 100644 +index efdc176e6..81969d2dc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -218,6 +218,8 @@ public class PurpurWorldConfig { +@@ -209,6 +209,8 @@ public class PurpurWorldConfig { public boolean milkCuresBadOmen = true; public String playerDeathExpDropEquation = "expLevel * 7"; public int playerDeathExpDropMax = 100; @@ -112,7 +112,7 @@ index 2a81fed03..f2281d325 100644 public boolean playerSleepOnlyWithCondition = false; public String playerSleepCondition = "time >= 12541 && time <= 23458"; public boolean useBetterMending = false; -@@ -263,6 +265,8 @@ public class PurpurWorldConfig { +@@ -254,6 +256,8 @@ public class PurpurWorldConfig { milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation); playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax); diff --git a/patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch similarity index 96% rename from patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch rename to patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch index 421687199..8c43892e9 100644 --- a/patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ b/patches/server/0114-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch @@ -1,4 +1,4 @@ -From 77c2dc266e26e683a947a7e1b71a3f3e07a24b12 Mon Sep 17 00:00:00 2001 +From 542fb083595c2b7f4cb3c30d0a3f11783f825e50 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter diff --git a/patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 96% rename from patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch index d6c6cfa05..e12fe96d5 100644 --- a/patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0115-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -1,4 +1,4 @@ -From b0b3faca30bd2c573d637ab29e277e61ae9a5c47 Mon Sep 17 00:00:00 2001 +From fc67e01c4f086c30805c616b3da8a0011408f766 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 22:15:46 -0500 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options @@ -38,7 +38,7 @@ index cb36334e4..aa83ef169 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index efdc176e6..face0f71a 100644 +index 81969d2dc..296274896 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -191,6 +191,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-MC-4-Fix-Item-position-desync.patch b/patches/server/0116-MC-4-Fix-Item-position-desync.patch similarity index 98% rename from patches/server/0115-MC-4-Fix-Item-position-desync.patch rename to patches/server/0116-MC-4-Fix-Item-position-desync.patch index 3eb2588d7..0e03ec52d 100644 --- a/patches/server/0115-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0116-MC-4-Fix-Item-position-desync.patch @@ -1,4 +1,4 @@ -From ec553622fedae875d0244e0e7de6bdc195bfabaa Mon Sep 17 00:00:00 2001 +From 94b7f1d75467a481d686157ce9a6cef4f8cb04af Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] MC-4 Fix - Item position desync diff --git a/patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch similarity index 94% rename from patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch rename to patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch index 992827941..971b60a02 100644 --- a/patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch +++ b/patches/server/0117-MC-56653-Fix-pig-zombies-aggro.patch @@ -1,4 +1,4 @@ -From dfa8fa1518fab7f43b0458a0f548c12231b88a94 Mon Sep 17 00:00:00 2001 +From 9a2775903486689ae7032da239f1a557fccb8902 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 9 Jul 2019 20:56:47 -0500 Subject: [PATCH] MC-56653 Fix - pig zombies aggro @@ -43,10 +43,10 @@ index 90bf12c73..c78876fc4 100644 public PathfinderGoalAnger(EntityPigZombie entitypigzombie) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index face0f71a..b160e9628 100644 +index 296274896..7e7f10351 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1009,6 +1009,7 @@ public class PurpurWorldConfig { +@@ -1013,6 +1013,7 @@ public class PurpurWorldConfig { public boolean zombiePigmanJockeyOnlyBaby = true; public double zombiePigmanJockeyChance = 0.05D; public boolean zombiePigmanJockeyTryExistingChickens = true; @@ -54,7 +54,7 @@ index face0f71a..b160e9628 100644 private void zombiePigmanSettings() { zombiePigmanRidable = getBoolean("mobs.zombie_pigman.ridable", zombiePigmanRidable); zombiePigmanRidableInWater = getBoolean("mobs.zombie_pigman.ridable-in-water", zombiePigmanRidableInWater); -@@ -1016,6 +1017,7 @@ public class PurpurWorldConfig { +@@ -1020,6 +1021,7 @@ public class PurpurWorldConfig { zombiePigmanJockeyOnlyBaby = getBoolean("mobs.zombie_pigman.jockey.only-babies", zombiePigmanJockeyOnlyBaby); zombiePigmanJockeyChance = getDouble("mobs.zombie_pigman.jockey.chance", zombiePigmanJockeyChance); zombiePigmanJockeyTryExistingChickens = getBoolean("mobs.zombie_pigman.jockey.try-existing-chickens", zombiePigmanJockeyTryExistingChickens); diff --git a/patches/server/0117-EMC-MonsterEggSpawn-Event.patch b/patches/server/0118-EMC-MonsterEggSpawn-Event.patch similarity index 98% rename from patches/server/0117-EMC-MonsterEggSpawn-Event.patch rename to patches/server/0118-EMC-MonsterEggSpawn-Event.patch index 0035792fe..ab4c31f61 100644 --- a/patches/server/0117-EMC-MonsterEggSpawn-Event.patch +++ b/patches/server/0118-EMC-MonsterEggSpawn-Event.patch @@ -1,4 +1,4 @@ -From f3d4ecf04f5cebbc368a1241c826d679059c87ed Mon Sep 17 00:00:00 2001 +From ddbc85e7eef2d1144873414f6800925475599a09 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 20 Jul 2013 22:40:56 -0400 Subject: [PATCH] EMC - MonsterEggSpawn Event diff --git a/patches/server/0118-PaperPR-Add-BellRingEvent.patch b/patches/server/0119-PaperPR-Add-BellRingEvent.patch similarity index 97% rename from patches/server/0118-PaperPR-Add-BellRingEvent.patch rename to patches/server/0119-PaperPR-Add-BellRingEvent.patch index a8d4157ae..634bb664b 100644 --- a/patches/server/0118-PaperPR-Add-BellRingEvent.patch +++ b/patches/server/0119-PaperPR-Add-BellRingEvent.patch @@ -1,4 +1,4 @@ -From 84027803c6529ee821365ae5113e4661a395335c Mon Sep 17 00:00:00 2001 +From 1ed7f5fbc363311fbc87a785b48b100aec8d0b92 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:32 -0700 Subject: [PATCH] PaperPR - Add BellRingEvent diff --git a/patches/server/0119-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch similarity index 91% rename from patches/server/0119-PaperPR-Per-World-Spawn-limits.patch rename to patches/server/0120-PaperPR-Per-World-Spawn-limits.patch index 903767d4c..069c37d99 100644 --- a/patches/server/0119-PaperPR-Per-World-Spawn-limits.patch +++ b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch @@ -1,4 +1,4 @@ -From 51de97ed0fc5f6f99d478fa2da640ec1e6ce281c Mon Sep 17 00:00:00 2001 +From 50d9b3f7dccf2126aaf29dcfc4182ca41b939ada Mon Sep 17 00:00:00 2001 From: chase Date: Sun, 15 Mar 2020 18:32:22 -0600 Subject: [PATCH] PaperPR - Per World Spawn limits @@ -9,10 +9,10 @@ Subject: [PATCH] PaperPR - Per World Spawn limits 2 files changed, 18 insertions(+) diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b160e9628..2a81fed03 100644 +index 7e7f10351..f2281d325 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -309,6 +309,17 @@ public class PurpurWorldConfig { +@@ -313,6 +313,17 @@ public class PurpurWorldConfig { idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList); } @@ -31,7 +31,7 @@ index b160e9628..2a81fed03 100644 public boolean batRidableInWater = false; public boolean batRequireShiftToMount = true; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 05d3a0dcc..e44cc3755 100644 +index 2e230d118..97c2994a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -332,6 +332,13 @@ public class CraftWorld implements World { diff --git a/patches/server/0120-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch similarity index 95% rename from patches/server/0120-PaperPR-PlayerItemCooldownEvent.patch rename to patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch index 3ed1a2327..49bb22049 100644 --- a/patches/server/0120-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/server/0121-PaperPR-PlayerItemCooldownEvent.patch @@ -1,4 +1,4 @@ -From 118bed10294e70631cbcfbb1c6855ac2acf9d562 Mon Sep 17 00:00:00 2001 +From 58783d6634714ffc4850f6dae6d208315db0a4b4 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:06 +0200 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent diff --git a/patches/server/0121-Tuinity-Delay-chunk-unloads.patch b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch similarity index 99% rename from patches/server/0121-Tuinity-Delay-chunk-unloads.patch rename to patches/server/0122-Tuinity-Delay-chunk-unloads.patch index 903910fe0..3eee3cf51 100644 --- a/patches/server/0121-Tuinity-Delay-chunk-unloads.patch +++ b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch @@ -1,4 +1,4 @@ -From 1e76ab115e36171480950f8768e7c8dc6aa47e52 Mon Sep 17 00:00:00 2001 +From 1147b59943e44d47945854a93598659db7b894e4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 25 Oct 2019 02:11:30 -0700 Subject: [PATCH] Tuinity - Delay chunk unloads @@ -210,7 +210,7 @@ index be6baf299..ba2ac70ca 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e44cc3755..68cc7bf66 100644 +index 97c2994a9..1f5e1a5a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -487,6 +487,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch similarity index 94% rename from patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch rename to patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch index 55aa0320b..0940d6ee0 100644 --- a/patches/server/0122-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch +++ b/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch @@ -1,4 +1,4 @@ -From 09f70d85e3cff6a76378ab5cba7abb3c35b5925c Mon Sep 17 00:00:00 2001 +From 0ab7bd16c955aa134f4e121b004a1162775fe7e2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 3 Apr 2020 02:21:13 -0700 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server diff --git a/patches/server/0123-YAPFA-Disable-mojang-profiler.patch b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch similarity index 99% rename from patches/server/0123-YAPFA-Disable-mojang-profiler.patch rename to patches/server/0124-YAPFA-Disable-mojang-profiler.patch index 4cbe6475a..eee30202d 100644 --- a/patches/server/0123-YAPFA-Disable-mojang-profiler.patch +++ b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch @@ -1,4 +1,4 @@ -From cfb56fa355d16be0c94fc3eaf681c059dd938f07 Mon Sep 17 00:00:00 2001 +From 991f2c3f27e2810b224f2b10441d79257ce6b0f5 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] YAPFA - Disable mojang profiler