TotalFreedomMC/TF-WorldGuardExtraFlagsPlugin
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-WorldGuardExtraFlagsPlugin.git synced 2024-12-29 02:25:23 +00:00
Code Issues Projects Releases Wiki Activity

Fixed AsyncWorldEdit plugin exception

Browse source
This commit is contained in:
isokissa3 2018-11-30 20:08:43 +02:00
parent e87f92fbe3
commit 56e6dc83a0
8 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common/pom.xml
View file

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<version>4.1.1</version> <version>4.1.2-DEV</version>
</parent> </parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId> <groupId>net.goldtreeservers.worldguardextraflags</groupId>

2
Spigot/pom.xml
View file

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<version>4.1.1</version> <version>4.1.2-DEV</version>
</parent> </parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId> <groupId>net.goldtreeservers.worldguardextraflags</groupId>

2
WG/pom.xml
View file

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<version>4.1.1</version> <version>4.1.2-DEV</version>
</parent> </parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId> <groupId>net.goldtreeservers.worldguardextraflags</groupId>

2
WG6/pom.xml
View file

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<version>4.1.1</version> <version>4.1.2-DEV</version>
</parent> </parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId> <groupId>net.goldtreeservers.worldguardextraflags</groupId>

18
WG6/src/main/java/net/goldtreeservers/worldguardextraflags/wg/wrappers/v6/WorldEditFlagHandler.java
View file

@ -19,25 +19,31 @@ import net.goldtreeservers.worldguardextraflags.wg.WorldGuardUtils;
public class WorldEditFlagHandler extends AbstractDelegateExtent public class WorldEditFlagHandler extends AbstractDelegateExtent
{ {
protected final World world; protected final org.bukkit.World world;
protected final org.bukkit.entity.Player player; protected final org.bukkit.entity.Player player;
protected WorldEditFlagHandler(World world, Extent extent, Player player) protected WorldEditFlagHandler(World world, Extent extent, Player player)
{ {
super(extent); super(extent);
this.world = world; if (world instanceof BukkitWorld)
{
this.world = ((BukkitWorld)world).getWorld();
}
else
{
this.world = Bukkit.getWorld(world.getName());
}
this.player = Bukkit.getPlayer(player.getUniqueId()); this.player = Bukkit.getPlayer(player.getUniqueId());
} }
@Override @Override
public boolean setBlock(Vector location, BaseBlock block) throws WorldEditException public boolean setBlock(Vector location, BaseBlock block) throws WorldEditException
{ {
org.bukkit.World world = ((BukkitWorld)this.world).getWorld(); ApplicableRegionSet regions = WorldGuardPlugin.inst().getRegionContainer().get(this.world).getApplicableRegions(location);
ApplicableRegionSet regions = WorldGuardPlugin.inst().getRegionContainer().get(world).getApplicableRegions(location); State state = WorldGuardUtils.queryState(this.player, this.world, regions.getRegions(), Flags.WORLDEDIT);
State state = WorldGuardUtils.queryState(this.player, world, regions.getRegions(), Flags.WORLDEDIT);
if (state != State.DENY) if (state != State.DENY)
{ {
return super.setBlock(location, block); return super.setBlock(location, block);

2
WG7/pom.xml
View file

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<version>4.1.1</version> <version>4.1.2-DEV</version>
</parent> </parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId> <groupId>net.goldtreeservers.worldguardextraflags</groupId>

20
WG7/src/main/java/net/goldtreeservers/worldguardextraflags/wg/wrappers/v7/WorldEditFlagHandler.java
View file

@ -19,23 +19,35 @@ import net.goldtreeservers.worldguardextraflags.wg.WorldGuardUtils;
public class WorldEditFlagHandler extends AbstractDelegateExtent public class WorldEditFlagHandler extends AbstractDelegateExtent
{ {
protected final World world; protected final World weWorld;
protected final org.bukkit.World world;
protected final org.bukkit.entity.Player player; protected final org.bukkit.entity.Player player;
public WorldEditFlagHandler(World world, Extent extent, Player player) public WorldEditFlagHandler(World world, Extent extent, Player player)
{ {
super(extent); super(extent);
this.world = world; this.weWorld = world;
if (world instanceof BukkitWorld)
{
this.world = ((BukkitWorld)world).getWorld();
}
else
{
this.world = Bukkit.getWorld(world.getName());
}
this.player = Bukkit.getPlayer(player.getUniqueId()); this.player = Bukkit.getPlayer(player.getUniqueId());
} }
@Override @Override
public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws WorldEditException public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws WorldEditException
{ {
ApplicableRegionSet regions = WorldGuard.getInstance().getPlatform().getRegionContainer().get(this.world).getApplicableRegions(location); ApplicableRegionSet regions = WorldGuard.getInstance().getPlatform().getRegionContainer().get(this.weWorld).getApplicableRegions(location);
State state = WorldGuardUtils.queryState(this.player, ((BukkitWorld)this.world).getWorld(), regions.getRegions(), Flags.WORLDEDIT); State state = WorldGuardUtils.queryState(this.player, this.world, regions.getRegions(), Flags.WORLDEDIT);
if (state != State.DENY) if (state != State.DENY)
{ {
return super.setBlock(location, block); return super.setBlock(location, block);

2
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>net.goldtreeservers</groupId> <groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId> <artifactId>worldguardextraflags</artifactId>
<name>WorldGuardExtraFlags</name> <name>WorldGuardExtraFlags</name>
<version>4.1.1</version> <version>4.1.2-DEV</version>
<packaging>pom</packaging> <packaging>pom</packaging>