aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0559-Added-WorldGameRuleChangeEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0559-Added-WorldGameRuleChangeEvent.patch')
-rw-r--r--patches/server/0559-Added-WorldGameRuleChangeEvent.patch98
1 files changed, 98 insertions, 0 deletions
diff --git a/patches/server/0559-Added-WorldGameRuleChangeEvent.patch b/patches/server/0559-Added-WorldGameRuleChangeEvent.patch
new file mode 100644
index 0000000000..86de4a1af6
--- /dev/null
+++ b/patches/server/0559-Added-WorldGameRuleChangeEvent.patch
@@ -0,0 +1,98 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 20 Dec 2020 16:41:44 -0800
+Subject: [PATCH] Added WorldGameRuleChangeEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
+index 1b66c33a55a9516269c80f5052fb103418b11367..745b8724b7536a5b2c2c94ae8fd703ea755e8072 100644
+--- a/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
++++ b/src/main/java/net/minecraft/server/commands/GameRuleCommand.java
+@@ -33,7 +33,7 @@ public class GameRuleCommand {
+ CommandSourceStack commandlistenerwrapper = (CommandSourceStack) context.getSource();
+ T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(key); // CraftBukkit
+
+- t0.setFromArgument(context, "value");
++ t0.setFromArgument(context, "value", key); // Paper
+ commandlistenerwrapper.sendSuccess(Component.translatable("commands.gamerule.set", key.getId(), t0.toString()), true);
+ return t0.getCommandResult();
+ }
+diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
+index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06e81e080d 100644
+--- a/src/main/java/net/minecraft/world/level/GameRules.java
++++ b/src/main/java/net/minecraft/world/level/GameRules.java
+@@ -262,10 +262,10 @@ public class GameRules {
+ this.type = type;
+ }
+
+- protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name);
++ protected abstract void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey); // Paper
+
+- public void setFromArgument(CommandContext<CommandSourceStack> context, String name) {
+- this.updateFromArgument(context, name);
++ public void setFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<T> gameRuleKey) { // Paper
++ this.updateFromArgument(context, name, gameRuleKey); // Paper
+ this.onChanged(((CommandSourceStack) context.getSource()).getServer());
+ }
+
+@@ -323,8 +323,11 @@ public class GameRules {
+ }
+
+ @Override
+- protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
+- this.value = BoolArgumentType.getBool(context, name);
++ protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<BooleanValue> gameRuleKey) { // Paper start
++ io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Boolean>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(BoolArgumentType.getBool(context, name)));
++ if (!event.callEvent()) return;
++ this.value = Boolean.parseBoolean(event.getValue());
++ // Paper end
+ }
+
+ public boolean get() {
+@@ -388,8 +391,11 @@ public class GameRules {
+ }
+
+ @Override
+- protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name) {
+- this.value = IntegerArgumentType.getInteger(context, name);
++ protected void updateFromArgument(CommandContext<CommandSourceStack> context, String name, GameRules.Key<IntegerValue> gameRuleKey) { // Paper start
++ io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(context.getSource().getBukkitWorld(), context.getSource().getBukkitSender(), (org.bukkit.GameRule<Integer>) org.bukkit.GameRule.getByName(gameRuleKey.toString()), String.valueOf(IntegerArgumentType.getInteger(context, name)));
++ if (!event.callEvent()) return;
++ this.value = Integer.parseInt(event.getValue());
++ // Paper end
+ }
+
+ public int get() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index b95aed97b48bf31091ee2f44a21ad88071e97bf3..42423b020f9c2ef2ba025b444be076c38314c721 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -1803,8 +1803,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+
+ if (!this.isGameRule(rule)) return false;
+
++ // Paper start
++ GameRule<?> gameRule = GameRule.getByName(rule);
++ io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, gameRule, value);
++ if (!event.callEvent()) return false;
++ // Paper end
+ GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
+- handle.deserialize(value);
++ handle.deserialize(event.getValue()); // Paper
+ handle.onChanged(this.getHandle().getServer());
+ return true;
+ }
+@@ -1839,8 +1844,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+
+ if (!this.isGameRule(rule.getName())) return false;
+
++ // Paper start
++ io.papermc.paper.event.world.WorldGameRuleChangeEvent event = new io.papermc.paper.event.world.WorldGameRuleChangeEvent(this, null, rule, String.valueOf(newValue));
++ if (!event.callEvent()) return false;
++ // Paper end
+ GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
+- handle.deserialize(newValue.toString());
++ handle.deserialize(event.getValue()); // Paper
+ handle.onChanged(this.getHandle().getServer());
+ return true;
+ }