Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use command block's world for /gamerule. Fixes BUKKIT-3274

Browse Source 
In vanilla, gamerules are global, across all worlds. Maps created for
vanilla that use command blocks expect this behavior, which is broken
when they are placed on a world that is not the default world (world #0).

This commit changes that by using the command block's current world when
executing the command, forcing the game rules executed to be executed in
the world the command block is currently in.
This commit is contained in:
Kane York 2013-08-10 10:37:35 -07:00 committed by Travis Ralston
parent ed364a7ef7
commit 94daac860a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/command/defaults/GameRuleCommand.java
View File

@ -3,6 +3,7 @@ package org.bukkit.command.defaults;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil; import org.bukkit.util.StringUtil;
@ -61,6 +62,8 @@ public class GameRuleCommand extends VanillaCommand {
if (world != null) { if (world != null) {
return world; return world;
} }
} else if (sender instanceof BlockCommandSender) {
return ((BlockCommandSender) sender).getBlock().getWorld();
} }
return Bukkit.getWorlds().get(0); return Bukkit.getWorlds().get(0);