2021-06-14 20:50:22 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
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
|
2023-06-08 01:56:33 +02:00
|
|
|
index c8c358531dbc167e249bac2af246c5e34fbdd4df..307854468ac985560b4c63b6e9897c444a7b8a3a 100644
|
2021-06-14 20:50:22 +02:00
|
|
|
--- 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
|
2023-06-08 01:56:33 +02:00
|
|
|
commandlistenerwrapper.sendSuccess(() -> {
|
|
|
|
return Component.translatable("commands.gamerule.set", key.getId(), t0.toString());
|
|
|
|
}, true);
|
2021-06-14 20:50:22 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
|
2023-03-14 21:25:13 +01:00
|
|
|
index 4a0321f56ef80aa4991e61f586ddd3f6b45e499b..de713f1ca1d61a6b1fca2b66de9162556d102449 100644
|
2021-06-14 20:50:22 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/GameRules.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/GameRules.java
|
2023-03-14 21:25:13 +01:00
|
|
|
@@ -271,10 +271,10 @@ public class GameRules {
|
2021-06-14 20:50:22 +02:00
|
|
|
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());
|
|
|
|
}
|
|
|
|
|
2023-03-14 21:25:13 +01:00
|
|
|
@@ -332,8 +332,11 @@ public class GameRules {
|
2021-06-14 20:50:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@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() {
|
2023-03-14 21:25:13 +01:00
|
|
|
@@ -397,8 +400,11 @@ public class GameRules {
|
2021-06-14 20:50:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@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
|
2023-06-08 01:56:33 +02:00
|
|
|
index 4e23d00f481697257adf9eae5bed4d02a2d5419b..1df230d4c583604486359ea141051a7b75ebb73b 100644
|
2021-06-14 20:50:22 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2023-06-08 01:56:33 +02:00
|
|
|
@@ -1844,8 +1844,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2021-06-14 20:50:22 +02:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
2023-06-08 01:56:33 +02:00
|
|
|
@@ -1880,8 +1885,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2021-06-14 20:50:22 +02:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|