forked from SteamWar/SteamWar
Merge pull request 'Fix NoClip' (#491) from Hut512/SteamWar:fix/swplayer-invalid-reference into main
Reviewed-on: SteamWar/SteamWar#491 Reviewed-by: YoyoNow <4+yoyonow@noreply.localhost>
This commit is contained in:
@@ -115,6 +115,7 @@ public class NoClipCommand extends SWCommand implements Listener {
|
|||||||
Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
|
Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
|
||||||
abilities.mayBuild = true;
|
abilities.mayBuild = true;
|
||||||
abilities.mayfly = true;
|
abilities.mayfly = true;
|
||||||
|
abilities.instabuild = true;
|
||||||
|
|
||||||
swPlayer.setComponent(new NoClipData());
|
swPlayer.setComponent(new NoClipData());
|
||||||
BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
|
BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
|
||||||
|
|||||||
@@ -131,6 +131,7 @@ public class BauScoreboard implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||||
|
SWScoreboard.impl.removeScoreboard(event.getPlayer());
|
||||||
ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer());
|
ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,7 +67,9 @@ public class SWScoreboard {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void removeScoreboard(Player player) {
|
public void removeScoreboard(Player player) {
|
||||||
|
if (player.getScoreboard().getObjective(SIDEBAR) != null) {
|
||||||
player.getScoreboard().getObjective(SIDEBAR).unregister();
|
player.getScoreboard().getObjective(SIDEBAR).unregister();
|
||||||
|
}
|
||||||
playerBoards.remove(player);
|
playerBoards.remove(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user