Drop allowPvP gamerule patch

Now implemented as a plugin in https://github.com/CloudCraftProjects/CloudUtilities
CloudCraftProjects · May 11, 2024 · bc93f4c · bc93f4c
1 parent 1c80c61
commit bc93f4c
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,6 @@ This fork is mainly designed to fit the CloudCraft Minecraft network.
 
 ## Features
 
-- `allowPvP` gamerule
 - Split item lore on newlines on protocol level
 - Instantly refresh various things on player locale change
 - Add version info to brand in F3 screen

diff --git a/patches/api/0003-Add-allowPvP-gamerule.patch → ...oved/api/0003-Add-allowPvP-gamerule.patch b/patches/api/0003-Add-allowPvP-gamerule.patch → ...oved/api/0003-Add-allowPvP-gamerule.patch
@@ -3,6 +3,7 @@ From: booky10 <[email protected]>
 Date: Fri, 9 Jul 2021 13:02:30 +0200
 Subject: [PATCH] Add allowPvP gamerule
 
+Dropped as this is now implemented as a plugin in https://github.com/CloudCraftProjects/CloudUtilities
 
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
 index be827e7fef0acb17bd41aeff9dc3dc4da3718e5e..2ce2d4845acc2d52dad27abf858621f26bebc2f7 100644

diff --git a/...s/server/0005-Add-allowPvP-gamerule.patch → ...d/server/0005-Add-allowPvP-gamerule.patch b/...s/server/0005-Add-allowPvP-gamerule.patch → ...d/server/0005-Add-allowPvP-gamerule.patch
@@ -3,6 +3,7 @@ From: booky10 <[email protected]>
 Date: Fri, 9 Jul 2021 11:28:12 +0200
 Subject: [PATCH] Add allowPvP gamerule
 
+Dropped as this is now implemented as a plugin in https://github.com/CloudCraftProjects/CloudUtilities
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 index 856fc37dddaf0bf76f9f8396524488ac077f5bf8..2c18904cf28550fc91bf06c2442d75ff6e2fdd40 100644

diff --git a/...em-lore-lines-on-newline-characters.patch → ...em-lore-lines-on-newline-characters.patch b/...em-lore-lines-on-newline-characters.patch → ...em-lore-lines-on-newline-characters.patch
diff --git a/...r/0007-Add-more-detailed-brand-info.patch → ...r/0006-Add-more-detailed-brand-info.patch b/...r/0007-Add-more-detailed-brand-info.patch → ...r/0006-Add-more-detailed-brand-info.patch
@@ -43,7 +43,7 @@ index e4086bea596e5f5d71491e0b7ad650d76939b8f9..5676e34c9b1dacbbac6ea34eeeb78b95
          List<KnownPack> list = this.server.getResourceManager().listPacks().flatMap((iresourcepack) -> {
              return iresourcepack.location().knownPackInfo().stream();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3b39ac5f1838746a0661c8aeffb3e2147faae05f..5750f5242c3034fcf02793e8dd1e34a0826bffb6 100644
+index 8c0b010c76dac3f4d3ac01ef778dea113da89d8c..a665f2b0bfbe90e9a6a99350349b405885d66f0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -269,7 +269,7 @@ import javax.annotation.Nonnull; // Paper

diff --git a/...t-for-changing-pufferfish-config-lo.patch → ...t-for-changing-pufferfish-config-lo.patch b/...t-for-changing-pufferfish-config-lo.patch → ...t-for-changing-pufferfish-config-lo.patch
diff --git a/...ckupArrowEvent-for-creative-players.patch → ...ckupArrowEvent-for-creative-players.patch b/...ckupArrowEvent-for-creative-players.patch → ...ckupArrowEvent-for-creative-players.patch
diff --git a/...ent-healing-amplifier-from-breaking.patch → ...ent-healing-amplifier-from-breaking.patch b/...ent-healing-amplifier-from-breaking.patch → ...ent-healing-amplifier-from-breaking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent healing amplifier from breaking
 
 
 diff --git a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
-index 1c7794de5f0a7238b944c9473e2cc9d011ef2306..c343c2920943d40d8ec560bbfd03dd245336704a 100644
+index b95afa9f6b7cf6c522ff5ec278adec7a9a851e9a..f9e13b0aa8d1009cf4fe263b765d525139fbdb17 100644
 --- a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
 @@ -30,13 +30,13 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {

diff --git a/...exceptions-caused-by-packet-sending.patch → ...exceptions-caused-by-packet-sending.patch b/...exceptions-caused-by-packet-sending.patch → ...exceptions-caused-by-packet-sending.patch
diff --git a/...-synced-opencount-for-shulker-boxes.patch → ...-synced-opencount-for-shulker-boxes.patch b/...-synced-opencount-for-shulker-boxes.patch → ...-synced-opencount-for-shulker-boxes.patch
diff --git a/...3-Resend-more-data-on-locale-change.patch → ...2-Resend-more-data-on-locale-change.patch b/...3-Resend-more-data-on-locale-change.patch → ...2-Resend-more-data-on-locale-change.patch
@@ -27,7 +27,7 @@ index c7e1f2bac3eca9bb72bf1f8c26cccb2905e1ddfc..4ce4479619cc189e1d6999537deaceff
          this.player = owner;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2c18904cf28550fc91bf06c2442d75ff6e2fdd40..3a05f8401c65875386b8d7111c02026b95e04cf0 100644
+index 856fc37dddaf0bf76f9f8396524488ac077f5bf8..a2fe2f667046220ae802326e9c765f0e05ffe284 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -346,6 +346,10 @@ public class ServerPlayer extends Player {