fix(events): a bunch of small fixes (#110)

TTtie · web-flow · commit 2da00a1b0366 · 2026-06-22T16:24:36.000-07:00
* fix(HostAddMenu): filter players by correct permission

Makes it so the player list in the menu is filtered by those who can host map parties (`community.event` as per MapPartyFeature) instead of `community.staff`.

Signed-off-by: TTtie &lt;me@tttie.cz&gt;

* fix(events): require event type for `/event create`, fix NPE on null event type

Creating an event using `/event create` without a type passed in throws a NPE in MapPartyFeature#create due to null event type. This commit fixes both the NPE and makes the event type required to ensure consistency between the event GUI and event commands.

Signed-off-by: TTtie &lt;me@tttie.cz&gt;

* fix(events): require preset name for `/event preset`

Makes the preset name in /event preset a required parameter as it doesn't make sense to create against a null preset.

Signed-off-by: TTtie &lt;me@tttie.cz&gt;

* fix(events): allow removing online event hosts

This commit fixes an issue where event hosts that were online couldn't be removed from the event host list due to them being resolved to a UUID.

This fix is suboptimal, but given that this doesn't happen often, it is probably sufficient.

Signed-off-by: TTtie &lt;me@tttie.cz&gt;

---------

Signed-off-by: TTtie &lt;me@tttie.cz&gt;
diff --git a/core/src/main/java/dev/pgm/community/party/MapPartyCommands.java b/core/src/main/java/dev/pgm/community/party/MapPartyCommands.java
@@ -47,7 +47,7 @@ public void menu(CommandAudience viewer, Player sender) {
     }
   }
 
-  @Command("create [type]")
+  @Command("create <type>")
   @Permission(CommunityPermissions.PARTY)
   public void create(
       CommandAudience viewer,
@@ -61,7 +61,7 @@ public void create(
     }
   }
 
-  @Command("preset [name]")
+  @Command("preset <name>")
   @Permission(CommunityPermissions.PARTY)
   public void createPreset(
       CommandAudience viewer,
diff --git a/core/src/main/java/dev/pgm/community/party/feature/MapPartyFeature.java b/core/src/main/java/dev/pgm/community/party/feature/MapPartyFeature.java
@@ -184,6 +184,7 @@ public boolean create(CommandAudience viewer, Player sender, MapPartyType type,
       case REGULAR:
         this.party = new RegularPoolParty(sender, getEventConfig());
         break;
+      case null:
       default:
         return false;
       // Catch unknown party type
diff --git a/core/src/main/java/dev/pgm/community/party/hosts/MapPartyHosts.java b/core/src/main/java/dev/pgm/community/party/hosts/MapPartyHosts.java
@@ -67,7 +67,8 @@ public void addSubHost(Player player) {
 
   public boolean removeSubHost(String name) {
     Entry<UUID, String> cachedEntry = nameCache.entrySet().stream()
-        .filter(e -> e.getValue().equalsIgnoreCase(name))
+        .filter(e ->
+            e.getKey().toString().equalsIgnoreCase(name) || e.getValue().equalsIgnoreCase(name))
         .findAny()
         .orElse(null);
 
diff --git a/core/src/main/java/dev/pgm/community/party/menu/hosts/HostAddMenu.java b/core/src/main/java/dev/pgm/community/party/menu/hosts/HostAddMenu.java
@@ -46,7 +46,7 @@ public void init(Player player, InventoryContents contents) {
 
   @Override
   public Predicate<Player> relevantPlayerFilter() {
-    return player -> player.hasPermission(CommunityPermissions.STAFF);
+    return player -> player.hasPermission(CommunityPermissions.PARTY);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void menu(CommandAudience viewer, Player sender) {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- @Command("create [type]")`
	`50`	`+ @Command("create <type>")`
`51`	`51`	`@Permission(CommunityPermissions.PARTY)`
`52`	`52`	`public void create(`
`53`	`53`	`CommandAudience viewer,`
`@@ -61,7 +61,7 @@ public void create(`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`- @Command("preset [name]")`
	`64`	`+ @Command("preset <name>")`
`65`	`65`	`@Permission(CommunityPermissions.PARTY)`
`66`	`66`	`public void createPreset(`
`67`	`67`	`CommandAudience viewer,`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void init(Player player, InventoryContents contents) {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public Predicate<Player> relevantPlayerFilter() {`
`49`		`- return player -> player.hasPermission(CommunityPermissions.STAFF);`
	`49`	`+ return player -> player.hasPermission(CommunityPermissions.PARTY);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`