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

Rename town explosion methods #6102

Merged
merged 2 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion src/com/palmergames/bukkit/towny/TownyFormatter.java
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public static StatusScreen getStatus(Town town, CommandSender sender) {

// Permissions: B=rnao D=---- S=rna- I=rnao
screen.addComponentOf("perm", colourKeyValue(translator.of("status_perm"), town.getPermissions().getColourString().replace("f", "r")));
screen.addComponentOf("explosion", colourKeyValue(translator.of("explosions"), (town.isBANG() || world.isForceExpl()) ? translator.of("status_on"): translator.of("status_off")));
screen.addComponentOf("explosion", colourKeyValue(translator.of("explosions"), (town.isExplosion() || world.isForceExpl()) ? translator.of("status_on"): translator.of("status_off")));
screen.addComponentOf("firespread", colourKeyValue(translator.of("firespread"), (town.isFire() || world.isForceFire()) ? translator.of("status_on"): translator.of("status_off")));
screen.addComponentOf("mobspawns", colourKeyValue(translator.of("mobspawns"), (town.hasMobs() || world.isForceTownMobs()) ? translator.of("status_on"): translator.of("status_off")));

Expand Down
8 changes: 4 additions & 4 deletions src/com/palmergames/bukkit/towny/command/TownCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -1553,19 +1553,19 @@ public static void townToggle(CommandSender sender, String[] split, boolean admi
toggleTest(town, StringMgmt.join(split, " "));

// Fire cancellable event directly before setting the toggle.
TownToggleExplosionEvent preEvent = new TownToggleExplosionEvent(sender, town, admin, choice.orElse(!town.isBANG()));
TownToggleExplosionEvent preEvent = new TownToggleExplosionEvent(sender, town, admin, choice.orElse(!town.isExplosion()));
Bukkit.getPluginManager().callEvent(preEvent);
if (preEvent.isCancelled())
throw new TownyException(preEvent.getCancellationMsg());

// Set the toggle setting.
town.setBANG(preEvent.getFutureState());
town.setExplosion(preEvent.getFutureState());
permChanged = true;

// Send message feedback.
TownyMessaging.sendPrefixedTownMessage(town, Translatable.of("msg_changed_expl", town.getName(), town.isBANG() ? Translatable.of("enabled") : Translatable.of("disabled")));
TownyMessaging.sendPrefixedTownMessage(town, Translatable.of("msg_changed_expl", town.getName(), town.isExplosion() ? Translatable.of("enabled") : Translatable.of("disabled")));
if (admin)
TownyMessaging.sendMsg(sender, Translatable.of("msg_changed_expl", town.getName(), town.isBANG() ? Translatable.of("enabled") : Translatable.of("disabled")));
TownyMessaging.sendMsg(sender, Translatable.of("msg_changed_expl", town.getName(), town.isExplosion() ? Translatable.of("enabled") : Translatable.of("disabled")));

} else if (split[0].equalsIgnoreCase("fire")) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
public class TownToggleExplosionEvent extends TownToggleStateEvent {

public TownToggleExplosionEvent(CommandSender sender, Town town, boolean admin, boolean newState) {
super(sender, town, admin, town.isBANG(), newState);
super(sender, town, admin, town.isExplosion(), newState);
}

}
14 changes: 11 additions & 3 deletions src/com/palmergames/bukkit/towny/object/Town.java
Original file line number Diff line number Diff line change
Expand Up @@ -449,13 +449,21 @@ public boolean isAdminEnabledPVP() {
return this.adminEnabledPVP;
}

@Deprecated
Warriorrrr marked this conversation as resolved.
Show resolved Hide resolved
public void setBANG(boolean isBANG) {

this.permissions.explosion = isBANG;
setExplosion(isBANG);
}

@Deprecated
Warriorrrr marked this conversation as resolved.
Show resolved Hide resolved
public boolean isBANG() {

return isExplosion();
}

public void setExplosion(boolean isExplosion) {
this.permissions.explosion = isExplosion;
}

public boolean isExplosion() {
return this.permissions.explosion;
}

Expand Down