Skip to content

Call WorldGameRuleChangeEvent for World Options Menu #13720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Doc94 wants to merge 6 commits into
base: dev/26.1
Choose a base branch
from
+13 −5
Open

Call WorldGameRuleChangeEvent for World Options Menu #13720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c90258b
Call WorldGameRuleChangeEvent for World Options Menu
Doc94 Mar 25, 2026
988a9b7
Updated WorldGameRuleChangeEvent for reference new ways to update gam…
Doc94 Mar 25, 2026
eb98266
Redirect World#setPVP to World GameRule for call event
Doc94 Mar 25, 2026
41de674
Include permission check for game rule
Doc94 Mar 25, 2026
eeef059
Remove redundant set game rule for ServerGamePacketListenerImpl
Doc94 Mar 25, 2026
695bf18
Remove unused import
Doc94 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion paper-api/src/main/java/io/papermc/paper/event/world/WorldGameRuleChangeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
import org.jspecify.annotations.Nullable;

/**
* Called when a world's gamerule is changed, either by command or by api.
* Called when a world's gamerule is changed, either by command, world options menu, or by api.
* @see <a href="https://minecraft.wiki/w/Game_rule#Modifying_game_rules">Modifying game rules - Minecraft wiki</a>
*/
@NullMarked
public class WorldGameRuleChangeEvent extends WorldEvent implements Cancellable {
Expand Down
11 changes: 10 additions & 1 deletion ...rver/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,12 +584,21 @@
}
}

@@ -790,7 +_,7 @@
@Override
public void handleSetGameRule(final ServerboundSetGameRulePacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
- if (!this.player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
+ if (!this.player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER) && !this.player.getBukkitEntity().hasPermission("minecraft.command.gamerule")) { // Paper - add permission check
LOGGER.warn("Player {} tried to set game rule values without required permissions", this.player.getGameProfile().name());
} else {
GameRules gameRules = this.player.level().getGameRules();
@@ -808,7 +_,7 @@

private <T> void setGameRuleValue(final GameRules gameRules, final GameRule<T> rule, final String value) {
rule.deserialize(value).result().ifPresent(parsedValue -> {
- gameRules.set(rule, (T)parsedValue, this.server);
+ gameRules.set(rule, (T)parsedValue, this.player.level()); // Paper - per-world game rules
+ parsedValue = org.bukkit.craftbukkit.event.CraftEventFactory.handleGameRuleSet(rule, parsedValue, this.player.level(), this.player.getBukkitEntity()).value(); // Paper - per-world game rules and event
this.broadcastGameRuleChangeToOperators(rule, (T)parsedValue);
});
}
Expand Down
1 change: 0 additions & 1 deletion paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.item.crafting.RepairItemRecipe;
import net.minecraft.world.level.CustomSpawner;
import net.minecraft.world.level.gamerules.GameRules;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.LevelSettings;
import net.minecraft.world.level.biome.BiomeManager;
Expand Down
3 changes: 1 addition & 2 deletions paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.chunk.status.ChunkStatus;
import net.minecraft.world.level.gamerules.GameRule;
import net.minecraft.world.level.gamerules.GameRules;
import net.minecraft.world.level.levelgen.structure.StructureStart;
import net.minecraft.world.level.storage.LevelData;
import net.minecraft.world.level.storage.LevelResource;
Expand Down Expand Up @@ -1245,7 +1244,7 @@ public boolean getPVP() {

@Override
public void setPVP(boolean pvp) {
this.world.getGameRules().set(GameRules.PVP, pvp, this.world);
this.setGameRule(org.bukkit.GameRules.PVP, pvp);
}

@Override
Expand Down
Loading