From 97f6da266c341679c819707f8a2d048a36742c36 Mon Sep 17 00:00:00 2001 From: Gary Smoak Date: Sat, 1 Oct 2011 15:44:34 -0400 Subject: [PATCH 1/2] Add the "spread" flag to control grass / snow spread. --- dist/Residence.jar | Bin 440462 -> 440604 bytes .../bekvon/bukkit/residence/Residence.java | 6 +++--- .../listeners/ResidenceBlockListener.java | 2 +- .../residence/protection/FlagPermissions.java | 1 + src/languagefiles/English.yml | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dist/Residence.jar b/dist/Residence.jar index 7e193a0639fc61629d792a15982e41ea5af859e1..e82609d3ece0c1654f979f2b405089b14109ac91 100644 GIT binary patch delta 14258 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 SkmDidccpqAz56CiEc!qDWnZTN diff --git a/src/com/bekvon/bukkit/residence/Residence.java b/src/com/bekvon/bukkit/residence/Residence.java index bb5ba03db..2ef6f9389 100644 --- a/src/com/bekvon/bukkit/residence/Residence.java +++ b/src/com/bekvon/bukkit/residence/Residence.java @@ -261,6 +261,9 @@ public void onEnable() { pm.registerEvent(Event.Type.BLOCK_IGNITE, blistener, Priority.Lowest, this); pm.registerEvent(Event.Type.BLOCK_BURN, blistener, Priority.Lowest, this); pm.registerEvent(Event.Type.BLOCK_FROMTO, blistener, Priority.Lowest, this); + pm.registerEvent(Event.Type.BLOCK_SPREAD, blistener, Priority.Lowest, this); + pm.registerEvent(Event.Type.BLOCK_PISTON_EXTEND, blistener, Priority.Lowest, this); + pm.registerEvent(Event.Type.BLOCK_PISTON_RETRACT, blistener, Priority.Lowest, this); pm.registerEvent(Event.Type.PLAYER_INTERACT, plistener, Priority.Lowest, this); pm.registerEvent(Event.Type.PLAYER_MOVE, plistener, Priority.Lowest, this); pm.registerEvent(Event.Type.PLAYER_QUIT, plistener, Priority.Lowest, this); @@ -273,9 +276,6 @@ public void onEnable() { pm.registerEvent(Event.Type.EXPLOSION_PRIME, elistener, Priority.Lowest, this); pm.registerEvent(Event.Type.PAINTING_PLACE, elistener, Priority.Lowest, this); pm.registerEvent(Event.Type.PAINTING_BREAK, elistener, Priority.Lowest, this); - pm.registerEvent(Event.Type.BLOCK_SPREAD, blistener, Priority.Lowest, this); - pm.registerEvent(Event.Type.BLOCK_PISTON_EXTEND, blistener, Priority.Lowest, this); - pm.registerEvent(Event.Type.BLOCK_PISTON_RETRACT, blistener, Priority.Lowest, this); pm.registerEvent(Event.Type.ENDERMAN_PICKUP, elistener, Priority.Lowest, this); pm.registerEvent(Event.Type.ENDERMAN_PLACE, elistener, Priority.Lowest, this); if(cmanager.enableSpout()) diff --git a/src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java b/src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java index df799c119..b76f8403e 100644 --- a/src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java +++ b/src/com/bekvon/bukkit/residence/listeners/ResidenceBlockListener.java @@ -144,7 +144,7 @@ public void onBlockPlace(BlockPlaceEvent event) { public void onBlockSpread(BlockSpreadEvent event) { Location loc = event.getBlock().getLocation(); FlagPermissions perms = Residence.getPermsByLoc(loc); - if(!perms.has("firespread", true)) + if(!perms.has("spread", true)) event.setCancelled(true); } diff --git a/src/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/com/bekvon/bukkit/residence/protection/FlagPermissions.java index 4c41ea2e1..b33759dde 100644 --- a/src/com/bekvon/bukkit/residence/protection/FlagPermissions.java +++ b/src/com/bekvon/bukkit/residence/protection/FlagPermissions.java @@ -71,6 +71,7 @@ public static void initValidFlags() addResidenceOnlyFlag("waterflow"); addResidenceOnlyFlag("physics"); addResidenceOnlyFlag("piston"); + addResidenceOnlyFlag("spread"); addPlayerOrGroupOnlyFlag("admin"); } diff --git a/src/languagefiles/English.yml b/src/languagefiles/English.yml index 2c40f85b6..abc336a98 100644 --- a/src/languagefiles/English.yml +++ b/src/languagefiles/English.yml @@ -3,7 +3,7 @@ # when a newer version is detected, and your changes will be overwritten. Once you # have a copy of this file, change the Language: option under the Residence config.yml # to whatever you named your copy. -Version: 15 +Version: 16 Language: # The below lines represent various messages residence sends to the players. # Note that some messages have variables such as %1 that are inserted at runtime. @@ -430,6 +430,7 @@ CommandHelp: #this is just a holder node, that holds the entire help - 'lavaflow - allows or denys lava flow, overrides flow' - 'waterflow - allows or denys water flow, overrides flow' - 'damage - allows or denys all entity damage within the residence.' + - 'piston - allow or deny pistons from pushing or pulling blocks in the residence.' list: Description: List Residences Info: From bb38255eff576ed23378ac54ce88309ae463cd64 Mon Sep 17 00:00:00 2001 From: Moo0 Date: Sat, 15 Oct 2011 18:06:19 +0100 Subject: [PATCH 2/2] Fix commas in buyable/rentable lists not appearing. --- src/com/bekvon/bukkit/residence/economy/TransactionManager.java | 2 +- src/com/bekvon/bukkit/residence/economy/rent/RentManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/bekvon/bukkit/residence/economy/TransactionManager.java b/src/com/bekvon/bukkit/residence/economy/TransactionManager.java index 56c55b5e5..c41e71873 100644 --- a/src/com/bekvon/bukkit/residence/economy/TransactionManager.java +++ b/src/com/bekvon/bukkit/residence/economy/TransactionManager.java @@ -256,7 +256,7 @@ public void printForSaleResidences(Player player) { if (!firstadd) { sbuild.append(", "); } else { - firstadd = true; + firstadd = false; } sbuild.append(land.getKey()); } diff --git a/src/com/bekvon/bukkit/residence/economy/rent/RentManager.java b/src/com/bekvon/bukkit/residence/economy/rent/RentManager.java index d1f2fb608..aa0b2b328 100644 --- a/src/com/bekvon/bukkit/residence/economy/rent/RentManager.java +++ b/src/com/bekvon/bukkit/residence/economy/rent/RentManager.java @@ -449,7 +449,7 @@ public void printRentableResidences(Player player) if(!firstadd) sbuild.append(", "); else - firstadd = true; + firstadd = false; sbuild.append(land.getKey()); } }