Release 4.1.5

This commit is contained in:
aromaa 2020-12-13 19:41:59 +02:00
parent 4572780827
commit 263bb47f15
8 changed files with 114 additions and 7 deletions

View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

@ -0,0 +1,107 @@
package net.goldtreeservers.worldguardextraflags.listeners;
import com.sk89q.worldguard.bukkit.event.block.BreakBlockEvent;
import com.sk89q.worldguard.bukkit.event.block.PlaceBlockEvent;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.goldtreeservers.worldguardextraflags.WorldGuardExtraFlagsPlugin;
import net.goldtreeservers.worldguardextraflags.flags.Flags;
import net.goldtreeservers.worldguardextraflags.wg.WorldGuardUtils;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.Set;
@RequiredArgsConstructor
public class BlockListenerWG implements Listener
{
@Getter private final WorldGuardExtraFlagsPlugin plugin;
//TODO: Figure out something better for this
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = false)
public void onBlockPlaceEvent(PlaceBlockEvent event)
{
Event.Result originalResult = event.getResult();
Object cause = event.getCause().getRootCause();
if (cause instanceof Player)
{
Player player = (Player)cause;
for(Block block : event.getBlocks())
{
Material type = block.getType();
if (type == Material.AIR) //Workaround for https://github.com/aromaa/WorldGuardExtraFlagsPlugin/issues/12
{
type = event.getEffectiveMaterial();
}
ApplicableRegionSet regions = this.plugin.getWorldGuardCommunicator().getRegionContainer().createQuery().getApplicableRegions(block.getLocation());
Set<Material> state = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.ALLOW_BLOCK_PLACE);
if (state != null && state.contains(type))
{
event.setResult(Event.Result.ALLOW);
}
else
{
Set<Material> state2 = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.DENY_BLOCK_PLACE);
if (state2 != null && state2.contains(type))
{
event.setResult(Event.Result.DENY);
return;
}
else
{
event.setResult(originalResult);
return;
}
}
}
}
}
//TODO: Figure out something better for this
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = false)
public void onBlockBreakEvent(BreakBlockEvent event)
{
Event.Result originalResult = event.getResult();
Object cause = event.getCause().getRootCause();
if (cause instanceof Player)
{
Player player = (Player)cause;
for(Block block : event.getBlocks())
{
ApplicableRegionSet regions = this.plugin.getWorldGuardCommunicator().getRegionContainer().createQuery().getApplicableRegions(block.getLocation());
Set<Material> state = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.ALLOW_BLOCK_BREAK);
if (state != null && state.contains(block.getType()))
{
event.setResult(Event.Result.ALLOW);
}
else
{
Set<Material> state2 = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.DENY_BLOCK_BREAK);
if (state2 != null && state2.contains(block.getType()))
{
event.setResult(Event.Result.DENY);
return;
}
else
{
event.setResult(originalResult);
return;
}
}
}
}
}
}

View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

@ -3,7 +3,7 @@
<parent>
<groupId>net.goldtreeservers</groupId>
<artifactId>worldguardextraflags</artifactId>
<version>4.1.5-SNAPSHOT</version>
<version>4.1.5</version>
</parent>
<groupId>net.goldtreeservers.worldguardextraflags</groupId>

View file

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