Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

6c94cca15e

Browse Source
This commit is contained in:
Jesse Boyd
2019-06-29 00:01:51 +10:00
parent 3b2031c22c
commit 846a1b0769
26 changed files with 192 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FreeBuildRegion.java
View File

@ -55,9 +55,8 @@ public class FreeBuildRegion extends BukkitMaskManager {
World bukkitWorld = player.parent.getWorld();
AsyncWorld asyncWorld = AsyncWorld.wrap(bukkitWorld);
BlockVector3 vec1 = BlockVector3.at(0, 0, 0);
Location pos1 = BukkitAdapter.adapt(bukkitWorld, vec1);
Location pos2 = BukkitAdapter.adapt(bukkitWorld, vec1);
Location pos1 = BukkitAdapter.adapt(bukkitWorld, BlockVector3.ZERO);
Location pos2 = BukkitAdapter.adapt(bukkitWorld, BlockVector3.ZERO);
AsyncBlock block = new AsyncBlock(asyncWorld, new NullFaweQueue(asyncWorld.getWorldName(), BlockTypes.STONE.getDefaultState()), 0, 0, 0);
BlockBreakEvent event = new BlockBreakEvent(block, player.parent);

4
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/Worldguard.java
View File

@ -74,7 +74,7 @@ public class Worldguard extends BukkitMaskManager implements Listener {
}
public boolean isAllowed(LocalPlayer localplayer, ProtectedRegion region) {
if (region.isOwner(localplayer) || region.isOwner(localplayer)) {
if (region.isOwner(localplayer) || region.isOwner(localplayer.getName())) {
return true;
} else if (region.getId().toLowerCase().equals(localplayer.getName().toLowerCase())) {
return true;
@ -84,7 +84,7 @@ public class Worldguard extends BukkitMaskManager implements Listener {
return true;
}
if (localplayer.hasPermission("fawe.worldguard.member")) {
if (region.isMember(localplayer) || region.isMember(localplayer)) {
if (region.isMember(localplayer) || region.isMember(localplayer.getName())) {
return true;
} else if (region.isMember("*")) {
return true;

6
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/EditSessionBlockChangeDelegate.java
View File

@ -40,7 +40,7 @@ public class EditSessionBlockChangeDelegate implements BlockChangeDelegate {
@Override
public boolean setBlockData(int x, int y, int z, BlockData blockData) {
try {
editSession.setBlock(BlockVector3.at(x, y, z), BukkitAdapter.adapt(blockData));
editSession.setBlock(x, y, z, BukkitAdapter.adapt(blockData));
} catch (MaxChangedBlocksException e) {
return false;
}
@ -49,7 +49,7 @@ public class EditSessionBlockChangeDelegate implements BlockChangeDelegate {
@Override
public BlockData getBlockData(int x, int y, int z) {
return BukkitAdapter.adapt(editSession.getBlock(BlockVector3.at(x, y, z)));
return BukkitAdapter.adapt(editSession.getBlock(x, y, z));
}
@Override
@ -59,7 +59,7 @@ public class EditSessionBlockChangeDelegate implements BlockChangeDelegate {
@Override
public boolean isEmpty(int x, int y, int z) {
return editSession.getBlock(BlockVector3.at(x, y, z)).getBlockType().getMaterial().isAir();
return editSession.getBlock(x, y, z).getBlockType().getMaterial().isAir();
}
}