Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Ursprung
f0ecbbf427
Commit
72b03aa832
@ -25,6 +25,7 @@ import org.bukkit.Sound;
|
|||||||
import org.bukkit.SoundCategory;
|
import org.bukkit.SoundCategory;
|
||||||
import org.bukkit.entity.Arrow;
|
import org.bukkit.entity.Arrow;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.Projectile;
|
||||||
import org.bukkit.scoreboard.Team;
|
import org.bukkit.scoreboard.Team;
|
||||||
|
|
||||||
public class WorldOfColorWrapper12 implements WorldOfColorWrapper {
|
public class WorldOfColorWrapper12 implements WorldOfColorWrapper {
|
||||||
@ -34,8 +35,10 @@ public class WorldOfColorWrapper12 implements WorldOfColorWrapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isInBlock(Arrow e) {
|
public boolean isInBlock(Projectile e) {
|
||||||
return e.isInBlock();
|
if(e instanceof Arrow)
|
||||||
|
return ((Arrow) e).isInBlock();
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -22,8 +22,8 @@ package de.steamwar.fightsystem.utils;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Arrow;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.Projectile;
|
||||||
import org.bukkit.scoreboard.Team;
|
import org.bukkit.scoreboard.Team;
|
||||||
|
|
||||||
public class WorldOfColorWrapper8 implements WorldOfColorWrapper {
|
public class WorldOfColorWrapper8 implements WorldOfColorWrapper {
|
||||||
@ -33,7 +33,7 @@ public class WorldOfColorWrapper8 implements WorldOfColorWrapper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isInBlock(Arrow e) {
|
public boolean isInBlock(Projectile e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@ import de.steamwar.fightsystem.utils.WorldOfColorWrapper;
|
|||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
import org.bukkit.entity.Arrow;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.Projectile;
|
||||||
import org.bukkit.projectiles.ProjectileSource;
|
import org.bukkit.projectiles.ProjectileSource;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ public class ArrowStopper {
|
|||||||
private static final Class<?> entityArrow = Reflection.getClass("{nms.world.entity.projectile}.EntityArrow");
|
private static final Class<?> entityArrow = Reflection.getClass("{nms.world.entity.projectile}.EntityArrow");
|
||||||
private void run() {
|
private void run() {
|
||||||
Recording.iterateOverEntities(entityArrow::isInstance, entity -> {
|
Recording.iterateOverEntities(entityArrow::isInstance, entity -> {
|
||||||
Arrow arrow = (Arrow) entity;
|
Projectile arrow = (Projectile) entity;
|
||||||
if (invalidEntity(arrow))
|
if (invalidEntity(arrow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ public class ArrowStopper {
|
|||||||
return Config.HiddenBlocks.contains(block.getType().name().toLowerCase());
|
return Config.HiddenBlocks.contains(block.getType().name().toLowerCase());
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean invalidEntity(Arrow entity) {
|
private boolean invalidEntity(Projectile entity) {
|
||||||
Location location = entity.getLocation();
|
Location location = entity.getLocation();
|
||||||
boolean teamFrom = entity.getVelocity().getZ() > 0;
|
boolean teamFrom = entity.getVelocity().getZ() > 0;
|
||||||
boolean overMid = location.getZ() > Config.SpecSpawn.getZ();
|
boolean overMid = location.getZ() > Config.SpecSpawn.getZ();
|
||||||
|
@ -24,15 +24,15 @@ import de.steamwar.fightsystem.FightSystem;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Arrow;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.Projectile;
|
||||||
import org.bukkit.scoreboard.Team;
|
import org.bukkit.scoreboard.Team;
|
||||||
|
|
||||||
public interface WorldOfColorWrapper {
|
public interface WorldOfColorWrapper {
|
||||||
WorldOfColorWrapper impl = VersionDependent.getVersionImpl(FightSystem.getPlugin());
|
WorldOfColorWrapper impl = VersionDependent.getVersionImpl(FightSystem.getPlugin());
|
||||||
|
|
||||||
void setTeamColor(Team team, ChatColor color);
|
void setTeamColor(Team team, ChatColor color);
|
||||||
boolean isInBlock(Arrow e);
|
boolean isInBlock(Projectile e);
|
||||||
|
|
||||||
void playSound(Location location, Sound sound, String soundCategory, float volume, float pitch);
|
void playSound(Location location, Sound sound, String soundCategory, float volume, float pitch);
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren