Plexus
/
Plex
mirror of https://github.com/plexusorg/Plex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taah 2023-08-26 06:18:54 -07:00
parent 7ff6bdb171 668460f486
commit cea84884fc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main/java/dev/plex/listener/impl/TogglesListener.java
View File

@ -2,6 +2,7 @@ package dev.plex.listener.impl;
import dev.plex.listener.PlexListener;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.BlockExplodeEvent;
import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockRedstoneEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
@ -11,7 +12,7 @@ import org.bukkit.event.player.PlayerDropItemEvent;
public class TogglesListener extends PlexListener
{
@EventHandler
public void onBlockExplode(ExplosionPrimeEvent event)
public void onExplosionPrime(ExplosionPrimeEvent event)
{
if (!plugin.toggles.getBoolean("explosions"))
{
@ -20,6 +21,15 @@ public class TogglesListener extends PlexListener
}
}
@EventHandler
public void onBlockExplode(BlockExplodeEvent event) {
if (!plugin.toggles.getBoolean("explosions"))
{
event.getBlock().breakNaturally();
event.setCancelled(true);
}
}
@EventHandler
public void onEntityExplode(EntityExplodeEvent event)
{

2
server/src/main/java/dev/plex/util/PlexUtils.java
View File

@ -262,6 +262,6 @@ public class PlexUtils implements PlexBase
public static String cleanString(String input)
{
return CharMatcher.ascii().retainFrom(input);
return CharMatcher.forPredicate(c -> Character.getDirectionality(c) != Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE && Character.getDirectionality(c) != Character.DIRECTIONALITY_RIGHT_TO_LEFT).retainFrom(input);
}
}