From ea63704c384aa5d54f68b0344d982d5f56dd4b2b Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 2 Nov 2020 17:11:18 +0100 Subject: [PATCH] Kick non players and record more blocks (to prevent ghost blocks) Signed-off-by: Lixfel --- .../steamwar/fightsystem/listener/EventJoinListener.java | 7 ++++++- .../steamwar/fightsystem/listener/EventRecordListener.java | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java index 73284cd..6e60e5c 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java @@ -82,10 +82,15 @@ public class EventJoinListener extends BasicListener { FightPlayer fp = team.addMember(player); if(!team.hasTeamLeader()) team.setLeader(fp); + return; } - if(user.getId() == FightSystem.getEventFight().getKampfleiter()) + if(user.getId() == FightSystem.getEventFight().getKampfleiter()){ FightSystem.setEventLeiter(player); + return; + } + if(Config.SpectateSystem) + player.kickPlayer("§cDu bist kein Kampfteilnehmer"); } @EventHandler diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java index 12ed538..7b690a1 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java @@ -104,9 +104,8 @@ public class EventRecordListener extends BasicListener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockPhysics(BlockPhysicsEvent e){ - if(e.getBlock() != e.getSourceBlock()) - return; - RecordSystem.blockChange(e.getBlock()); + if(e.getBlock() == e.getSourceBlock() || e.getChangedType() == Material.AIR) + RecordSystem.blockChange(e.getBlock()); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)