ChromaGaming/ButtonPresents
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Made Towny-Factions work for... not just 16x16 plots

Browse source 
Math is hard
TBMCPlugins/PluginConfigs#68
This commit is contained in:
Norbi Peti 2019-09-21 22:16:44 +02:00
parent aa8d8a3028
commit ba0042311b
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/buttondevteam/presents/components/townyfactions/TownyFactionsComponent.java
View file

@ -34,7 +34,7 @@ public class TownyFactionsComponent extends Component<ButtonPresents> implements
return getConfig().getData("distance", 5); return getConfig().getData("distance", 5);
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onFactionsClaim(EventFactionsChunksChange event) throws NotRegisteredException { public void onFactionsClaim(EventFactionsChunksChange event) throws NotRegisteredException {
if (event.getNewFaction().isNone()) if (event.getNewFaction().isNone())
return; //Allow unclaiming return; //Allow unclaiming
@ -42,9 +42,10 @@ public class TownyFactionsComponent extends Component<ButtonPresents> implements
int x = chunk.getChunkX() * 16; int x = chunk.getChunkX() * 16;
int z = chunk.getChunkZ() * 16; int z = chunk.getChunkZ() * 16;
int size = Coord.getCellSize(); int size = Coord.getCellSize();
int amount = size / 16; int amount = 16 / size;
World world = chunk.asBukkitWorld(); World world = chunk.asBukkitWorld();
int max = 0; int max = 0;
if (amount < 1) amount = 1; //For plot sizes > 16
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {
for (int j = 0; j < amount; j++) { for (int j = 0; j < amount; j++) {
Coord coord = Coord.parseCoord(new Location(world, x + i * size, 64, z + j * size)); Coord coord = Coord.parseCoord(new Location(world, x + i * size, 64, z + j * size));
@ -53,15 +54,15 @@ public class TownyFactionsComponent extends Component<ButtonPresents> implements
if (dist > max) max = dist; if (dist > max) max = dist;
} }
} }
int distance = max * amount; int distance = max / amount;
if (distance().get() >= distance) { if (distance().get() >= distance) {
event.setCancelled(true); event.setCancelled(true);
event.getSender().sendMessage("§cYou are too close to a town! " + distance + " chunks away, " + distance().get() + " is allowed."); event.getSender().sendMessage("§cYou are too close to a town! " + (distance - 1) + " chunks away, " + distance().get() + " is allowed.");
} }
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onTownyClaim(TownPreClaimEvent event) { public void onTownyClaim(TownPreClaimEvent event) {
PS coord = PS.valueOf(getLocation(event.getTownBlock().getWorldCoord())); PS coord = PS.valueOf(getLocation(event.getTownBlock().getWorldCoord()));
int distance = distance().get(); int distance = distance().get();