tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve freeze observer excemption

This commit is contained in:
Austin Mayes 2019-04-24 17:31:21 -05:00
parent fa3ddd8c92
commit feae6993b9
No known key found for this signature in database
GPG Key ID: 72C78ABE045D34F6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PGM/src/main/java/tc/oc/pgm/freeze/Freeze.java
View File

@ -1,5 +1,6 @@
package tc.oc.pgm.freeze;
import java.util.Optional;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -28,6 +29,9 @@ import tc.oc.commons.core.chat.Component;
import tc.oc.commons.core.chat.Components;
import tc.oc.commons.core.commands.ComponentCommandException;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.pgm.PGM;
import tc.oc.pgm.match.MatchPlayer;
import tc.oc.pgm.match.MatchPlayerFinder;
@Singleton
public class Freeze implements PluginFacet {
@ -85,6 +89,15 @@ public class Freeze implements PluginFacet {
final FrozenPlayer frozenPlayer = frozenPlayers.get(freezee);
if(frozen && frozenPlayer == null) {
Optional<MatchPlayer> matchPlayer = PGM.getMatchManager().match(freezee)
.flatMap(match -> match.player(freezee));
if (matchPlayer.isPresent() && matchPlayer.get().isObserving()) {
throw new ComponentCommandException(new TranslatableComponent(
"command.freeze.exempt",
new PlayerComponent(identityProvider.currentIdentity(freezee), NameStyle.VERBOSE)
));
}
frozenPlayers.put(freezee, playerFreezer.freeze(freezee));
final BaseComponent freezeeMessage = new Component(new TranslatableComponent("freeze.frozen", freezerComponent), ChatColor.RED);

3
PGM/src/main/java/tc/oc/pgm/freeze/FreezeListener.java
View File

@ -55,11 +55,8 @@ public class FreezeListener implements Listener, PluginFacet {
event.getClickedItem().getType() == Material.ICE &&
event.getPlayer().getBukkit().hasPermission(Freeze.PERMISSION) &&
event.getClickedPlayer() != null) {
event.setCancelled(true);
if (event.getClickedPlayer().isObserving()) return;
try {
freeze.toggleFrozen(event.getPlayer().getBukkit(), event.getClickedPlayer().getBukkit());
} catch(CommandException e) {