Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update towny hook / fix pattern traverser

Browse Source
This commit is contained in:
Jesse Boyd 2018-08-29 01:04:25 +10:00
parent abd886acd7
commit 418cfa6d03
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/TownyFeature.java
View File

@ -4,10 +4,7 @@ import com.boydti.fawe.bukkit.FaweBukkit;
import com.boydti.fawe.object.FawePlayer; import com.boydti.fawe.object.FawePlayer;
import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.Towny;
import com.palmergames.bukkit.towny.exceptions.NotRegisteredException; import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
import com.palmergames.bukkit.towny.object.PlayerCache; import com.palmergames.bukkit.towny.object.*;
import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import com.palmergames.bukkit.towny.object.WorldCoord;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -28,18 +25,30 @@ public class TownyFeature extends BukkitMaskManager implements Listener {
if (block == null) { if (block == null) {
return false; return false;
} }
Resident resident;
try { try {
if (block.getResident().getName().equals(player.getName())) { resident = TownyUniverse.getDataSource().getResident(player.getName());
return true; try {
} if (block.getResident().equals(resident)) {
} catch (final Exception ignore) {}
if (player.hasPermission("fawe.towny.*")) {
return true;
} else try {
if (block.getTown().isMayor(TownyUniverse.getDataSource().getResident(player.getName()))) {
return true; return true;
} }
} catch (NotRegisteredException ignore) {} } catch (NotRegisteredException ignore) {}
Town town = block.getTown();
if (town.isMayor(resident)) {
return true;
}
if (!town.hasResident(resident)) return false;
if (player.hasPermission("fawe.towny.*")) {
return true;
}
for (String rank : resident.getTownRanks()) {
if (player.hasPermission("fawe.towny." + rank)) {
return true;
}
}
} catch (NotRegisteredException e) {
return false;
}
return false; return false;
} }
@ -57,21 +66,7 @@ public class TownyFeature extends BukkitMaskManager implements Listener {
if (myplot == null) { if (myplot == null) {
return null; return null;
} else { } else {
boolean isMember = false; boolean isMember = isAllowed(player, myplot);
try {
if (myplot.getResident().getName().equals(player.getName())) {
isMember = true;
}
} catch (final Exception e) {
}
if (!isMember) {
if (player.hasPermission("fawe.towny.*")) {
isMember = true;
} else if (myplot.getTown().isMayor(TownyUniverse.getDataSource().getResident(player.getName()))) {
isMember = true;
}
}
if (isMember) { if (isMember) {
final Chunk chunk = location.getChunk(); final Chunk chunk = location.getChunk();
final Location pos1 = new Location(location.getWorld(), chunk.getX() * 16, 0, chunk.getZ() * 16); final Location pos1 = new Location(location.getWorld(), chunk.getX() * 16, 0, chunk.getZ() * 16);

8
worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PatternTraverser.java
View File

@ -34,7 +34,7 @@ public class PatternTraverser {
Field field = current.getDeclaredField("extent"); Field field = current.getDeclaredField("extent");
field.setAccessible(true); field.setAccessible(true);
field.set(pattern, newExtent); field.set(pattern, newExtent);
} catch (NoSuchFieldException | IllegalAccessException ignore) { } catch (NoSuchFieldException | IllegalAccessException | ClassCastException ignore) {
} }
} }
try { try {
@ -42,7 +42,7 @@ public class PatternTraverser {
field.setAccessible(true); field.setAccessible(true);
Object next = field.get(pattern); Object next = field.get(pattern);
reset(next, newExtent); reset(next, newExtent);
} catch (NoSuchFieldException | IllegalAccessException ignore) { } catch (NoSuchFieldException | IllegalAccessException | ClassCastException ignore) {
} }
try { try {
Field field = current.getDeclaredField("mask"); Field field = current.getDeclaredField("mask");
@ -56,7 +56,7 @@ public class PatternTraverser {
field.setAccessible(true); field.setAccessible(true);
Pattern next = (Pattern) field.get(pattern); Pattern next = (Pattern) field.get(pattern);
reset(next, newExtent); reset(next, newExtent);
} catch (NoSuchFieldException | IllegalAccessException ignore) { } catch (NoSuchFieldException | IllegalAccessException | ClassCastException ignore) {
} }
try { try {
Field field = current.getDeclaredField("patterns"); Field field = current.getDeclaredField("patterns");
@ -65,7 +65,7 @@ public class PatternTraverser {
for (Pattern next : patterns) { for (Pattern next : patterns) {
reset(next, newExtent); reset(next, newExtent);
} }
} catch (NoSuchFieldException | IllegalAccessException ignore) { } catch (NoSuchFieldException | IllegalAccessException | ClassCastException ignore) {
} }
current = current.getSuperclass(); current = current.getSuperclass();
} }

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
View File

@ -1014,6 +1014,7 @@ public enum BlockTypes implements BlockType {
int size = blockMap.size(); int size = blockMap.size();
for (BlockTypes type : oldValues) { for (BlockTypes type : oldValues) {
if (!blockMap.containsKey(type.getId())) { if (!blockMap.containsKey(type.getId())) {
type.init(type.getId(), 0, new ArrayList<>());
Fawe.debug("Invalid block registered " + type.getId()); Fawe.debug("Invalid block registered " + type.getId());
size++; size++;
} }