SteamWar/FightSystem
Archiviert
13
1

Deleted BlockFromToListener
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Updated DragonTeleport in Permanent class
Dieser Commit ist enthalten in:
MoBrot 2022-07-03 16:02:47 +02:00
Ursprung 9774b28d57
Commit c245f4c2ba
3 geänderte Dateien mit 17 neuen und 32 gelöschten Zeilen

Datei anzeigen

@ -77,7 +77,6 @@ public class FightSystem extends JavaPlugin {
new DenyInventoryMovement(); new DenyInventoryMovement();
new EventJoin(); new EventJoin();
new Recording(); new Recording();
new BlockFromToListener();
//new ResourcePack(); //new ResourcePack();
new Check(); new Check();
new Shutdown(); new Shutdown();

Datei anzeigen

@ -1,31 +0,0 @@
package de.steamwar.fightsystem.listener;
import de.steamwar.fightsystem.ArenaMode;
import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentListener;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockFromToEvent;
public class BlockFromToListener implements Listener {
public BlockFromToListener(){
new StateDependentListener(ArenaMode.All, FightState.All, this);
}
@EventHandler
public void onBlockFromTo(BlockFromToEvent event) {
if (Fight.getBlueTeam().getSchemRegion().inRegion(event.getBlock())
&& Fight.getBlueTeam().getSchemRegion().inRegion(event.getToBlock())) {
return;
}
if (Fight.getRedTeam().getSchemRegion().inRegion(event.getBlock())
&& Fight.getRedTeam().getSchemRegion().inRegion(event.getToBlock())) {
return;
}
event.setCancelled(true);
}
}

Datei anzeigen

@ -29,10 +29,12 @@ import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentListener; import de.steamwar.fightsystem.states.StateDependentListener;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.SpawnerSpawnEvent; import org.bukkit.event.entity.SpawnerSpawnEvent;
@ -147,4 +149,19 @@ public class Permanent implements Listener {
if(!Config.ArenaLeaveable) if(!Config.ArenaLeaveable)
e.getWorld().setAutoSave(false); e.getWorld().setAutoSave(false);
} }
@EventHandler
public void onBlockFromTo(BlockFromToEvent event) {
if(event.getBlock().getType().equals(Material.DRAGON_EGG)) return;
for (FightTeam team : Fight.teams()) {
if(team.getExtendRegion().inRegion(event.getBlock())){
if(team.getExtendRegion().inRegion(event.getToBlock())) return;
}
}
event.setCancelled(true);
}
} }