Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-01 15:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/plexusorg/plex into taah-cmd-blocker

Browse Source 
 Conflicts:
	src/main/java/dev/plex/command/blocker/CommandBlockerManager.java
	src/main/java/dev/plex/listener/impl/CommandListener.java
	src/main/resources/commands.yml
This commit is contained in:
Taah
2022-04-10 15:03:32 -07:00
parent 8dfaaf7a8c 6b7bfacbfd
commit b449d732b0
4 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/plex/command/impl/EntityWipeCMD.java
View File

@ -54,7 +54,7 @@ public class EntityWipeCMD extends PlexCommand
{
if (entity.getType() != EntityType.PLAYER)
{
String type = entity.getName();
String type = entity.getType().name();
if (useBlacklist ? entityBlacklist.stream().noneMatch(entityName -> entityName.equalsIgnoreCase(type)) : entityWhitelist.stream().anyMatch(entityName -> entityName.equalsIgnoreCase(type)))
{
@ -99,7 +99,7 @@ public class EntityWipeCMD extends PlexCommand
{
if (entity.getType() != EntityType.PLAYER)
{
entities.add(entity.getName());
entities.add(entity.getType().name());
}
}
}