SteamWar/LobbySystem2.0
Archiviert
13
0
Fork 0
Code Issues 5 Pull-Requests Projekte Releases Wiki Aktivität

Fix PlayerSeatListener
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2022-03-26 11:17:56 +01:00
Ursprung a93fe5797d
Commit 9922f0b595
1 geänderte Dateien mit 7 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/de/steamwar/lobby/listener/PlayerSeatListener.java
Datei anzeigen

@ -25,6 +25,7 @@ import org.bukkit.block.data.Bisected;
import org.bukkit.block.data.type.Stairs; import org.bukkit.block.data.type.Stairs;
import org.bukkit.entity.AbstractArrow; import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
@ -70,7 +71,7 @@ public class PlayerSeatListener extends BasicListener{
if (((Stairs) event.getClickedBlock().getBlockData()).getShape() != Stairs.Shape.STRAIGHT) if (((Stairs) event.getClickedBlock().getBlockData()).getShape() != Stairs.Shape.STRAIGHT)
return; return;
if (event.getPlayer().isInsideVehicle()) if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle()))
event.getPlayer().getVehicle().remove(); event.getPlayer().getVehicle().remove();
if (event.getClickedBlock().getRelative(0, 1, 0).getType() != Material.AIR) if (event.getClickedBlock().getRelative(0, 1, 0).getType() != Material.AIR)
@ -93,7 +94,7 @@ public class PlayerSeatListener extends BasicListener{
public void onEntityDismount(EntityDismountEvent event) { public void onEntityDismount(EntityDismountEvent event) {
seats.remove(getSeatLocation(event.getDismounted().getLocation())); seats.remove(getSeatLocation(event.getDismounted().getLocation()));
if (event.getEntityType() != EntityType.PLAYER && event.getDismounted().getType() != EntityType.ARROW) if (event.getEntityType() != EntityType.PLAYER && !isArrow(event.getDismounted()))
return; return;
event.getDismounted().remove(); event.getDismounted().remove();
@ -101,7 +102,7 @@ public class PlayerSeatListener extends BasicListener{
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
if (event.getPlayer().isInsideVehicle() && event.getPlayer().getVehicle().getType() == EntityType.ARROW) if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle()))
event.getPlayer().getVehicle().remove(); event.getPlayer().getVehicle().remove();
} }
@ -109,4 +110,7 @@ public class PlayerSeatListener extends BasicListener{
return new Location(world,location.getBlockX(), location.getBlockY(), location.getBlockZ()); return new Location(world,location.getBlockX(), location.getBlockY(), location.getBlockZ());
} }
private boolean isArrow(Entity entity) {
return entity.getType() == EntityType.ARROW;
}
} }