kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2025-07-26 23:45:15 +00:00
Code Issues Projects Releases Wiki Activity

Prevent server from half-crashing

Browse source
This commit is contained in:
mathiascode 2020-04-21 16:44:24 +03:00
parent 92d9e4ad64
commit 6fe4e56a7f
3 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java
View file

@ -40,7 +40,7 @@ public final class BlockPhysics implements Listener {
} }
} }
} }
} catch (Exception e) { } catch (Exception | StackOverflowError e) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -52,13 +52,14 @@ public final class BlockPhysics implements Listener {
event.getBlock().setType(Material.AIR, false); event.getBlock().setType(Material.AIR, false);
event.setCancelled(true); event.setCancelled(true);
} }
} catch (Exception e) { } catch (Exception | StackOverflowError e) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler @EventHandler
void onBlockForm(final BlockFormEvent event) { void onBlockForm(final BlockFormEvent event) {
try {
if (event.getBlock().getType() == Material.LAVA if (event.getBlock().getType() == Material.LAVA
|| event.getBlock().getType() == Material.WATER) { || event.getBlock().getType() == Material.WATER) {
for (BlockFace face : getBlockFaces()) { for (BlockFace face : getBlockFaces()) {
@ -69,10 +70,14 @@ public final class BlockPhysics implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
} }
} catch (Exception | StackOverflowError e) {
event.setCancelled(true);
}
} }
@EventHandler @EventHandler
void onBlockFromTo(final BlockFromToEvent event) { void onBlockFromTo(final BlockFromToEvent event) {
try {
if (event.getBlock().getType() == Material.LAVA if (event.getBlock().getType() == Material.LAVA
|| event.getBlock().getType() == Material.WATER) { || event.getBlock().getType() == Material.WATER) {
boolean lavaFound = false; boolean lavaFound = false;
@ -91,6 +96,9 @@ public final class BlockPhysics implements Listener {
} }
} }
} }
} catch (Exception | StackOverflowError e) {
event.setCancelled(true);
}
} }
@EventHandler @EventHandler
@ -121,7 +129,7 @@ public final class BlockPhysics implements Listener {
default: default:
break; break;
} }
} catch (Exception e) { } catch (Exception | StackOverflowError e) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

8
src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
View file

@ -27,14 +27,9 @@ import pw.kaboom.extras.Main;
public final class PlayerConnection implements Listener { public final class PlayerConnection implements Listener {
@EventHandler @EventHandler
void onAsyncPlayerPreLogin(final AsyncPlayerPreLoginEvent event) { void onAsyncPlayerPreLogin(final AsyncPlayerPreLoginEvent event) {
if (event.getName().length() > 16) { if (Bukkit.getPlayer(event.getName()) != null) {
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "Your username can't be longer than 16 characters");
} else {
for (Player player : Bukkit.getOnlinePlayers()) {
if (event.getName().equals(player.getName())) {
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "A player with that username is already logged in"); event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "A player with that username is already logged in");
} }
}
/*try { /*try {
final PlayerProfile profile = event.getPlayerProfile(); final PlayerProfile profile = event.getPlayerProfile();
@ -48,7 +43,6 @@ public final class PlayerConnection implements Listener {
} catch (Exception ignored) { } catch (Exception ignored) {
}*/ }*/
} }
}
@EventHandler @EventHandler
void onPlayerJoin(final PlayerJoinEvent event) { void onPlayerJoin(final PlayerJoinEvent event) {

10
src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java
View file

@ -1,7 +1,8 @@
package pw.kaboom.extras.modules.player; package pw.kaboom.extras.modules.player;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -48,11 +49,10 @@ public final class PlayerInteract implements Listener {
} }
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
final Block clickedBlock = event.getClickedBlock(); final BlockState clickedBlock = event.getClickedBlock().getState();
if (clickedBlock.getType() == Material.SIGN if (clickedBlock instanceof Sign) {
|| clickedBlock.getType() == Material.WALL_SIGN) { clickedBlock.update();
clickedBlock.getState().update();
} }
} }
} }