Skip to content
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.

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

Fix commas in buyable/rentable lists not appearing. #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified dist/Residence.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions src/com/bekvon/bukkit/residence/Residence.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public void printForSaleResidences(Player player) {
if (!firstadd) {
sbuild.append(", ");
} else {
firstadd = true;
firstadd = false;
}
sbuild.append(land.getKey());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public void printRentableResidences(Player player)
if(!firstadd)
sbuild.append(", ");
else
firstadd = true;
firstadd = false;
sbuild.append(land.getKey());
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public static void initValidFlags()
addResidenceOnlyFlag("waterflow");
addResidenceOnlyFlag("physics");
addResidenceOnlyFlag("piston");
addResidenceOnlyFlag("spread");
addPlayerOrGroupOnlyFlag("admin");
}

Expand Down
3 changes: 2 additions & 1 deletion src/languagefiles/English.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down