streamline getTeamsInventory

DirkyJerky · DirkyJerky · commit 33863c32f7cc · 2018-06-09T13:33:57.000-05:00
diff --git a/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/TeamChestMutation.java b/PGM/src/main/java/tc/oc/pgm/mutation/types/kit/TeamChestMutation.java
@@ -123,12 +123,8 @@ private boolean isBlacklistedItem(ItemStack item) {
     }
 
     private Optional<Inventory> getTeamsInventory(Player bukkitPlayer) {
-        MatchPlayer player = match().getPlayer(bukkitPlayer);
-        Party team = player.getParty();
-
-        if (!team.isParticipating()) return Optional.empty();
-
-        return Optional.of(teamChests.get(team));
+        return match().participant((Entity) bukkitPlayer)
+                .map(matchPlayer -> teamChests.get(matchPlayer.getParty()));
     }
 
     private Kit getKitForPlayer(MatchPlayer player) {

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,8 @@ private boolean isBlacklistedItem(ItemStack item) {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private Optional<Inventory> getTeamsInventory(Player bukkitPlayer) {`
`126`		`- MatchPlayer player = match().getPlayer(bukkitPlayer);`
`127`		`- Party team = player.getParty();`
`128`		`-`
`129`		`- if (!team.isParticipating()) return Optional.empty();`
`130`		`-`
`131`		`- return Optional.of(teamChests.get(team));`
	`126`	`+ return match().participant((Entity) bukkitPlayer)`
	`127`	`+ .map(matchPlayer -> teamChests.get(matchPlayer.getParty()));`
`132`	`128`	`}`
`133`	`129`
`134`	`130`	`private Kit getKitForPlayer(MatchPlayer player) {`