JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make players transparent

This commit is contained in:
Sam 2018-09-08 21:42:46 +01:00 committed by Alexander Meech
parent ee619c0a22
commit 835b50c683
5 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -824,12 +824,6 @@ public class Chat extends MiniPlugin
event.getRecipients().removeIf(recipient -> !_preferencesManager.get(recipient).isActive(Preference.SHOW_CHAT));
}
if (customEvent.isFiltered())
{
message = decapsifyIfNecessary(sender, message);
message = filterMessage(sender, true, message);
}
if (message.isEmpty())
{
event.setCancelled(true);
@ -882,6 +876,20 @@ public class Chat extends MiniPlugin
event.getRecipients().forEach(player -> player.spigot().sendMessage(formatted));
}
@EventHandler(priority = EventPriority.HIGHEST)
public void filterMessage(FormatPlayerChatEvent event)
{
if (event.isFiltered())
{
String message = event.getMessage();
message = decapsifyIfNecessary(event.getPlayer(), message);
message = filterMessage(event.getPlayer(), true, message);
event.setMessage(message);
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onSignChange(SignChangeEvent event)
{

6
Plugins/Mineplex.Core/src/mineplex/core/chatsnap/SnapshotPlugin.java
View File

@ -3,19 +3,17 @@ package mineplex.core.chatsnap;
import java.util.Set;
import java.util.stream.Collectors;
import mineplex.core.chat.ChatChannel;
import mineplex.core.chat.event.FormatPlayerChatEvent;
import mineplex.core.message.MessageManager;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.account.permissions.Permission;
import mineplex.core.account.permissions.PermissionGroup;
import mineplex.core.chat.ChatChannel;
import mineplex.core.chat.event.FormatPlayerChatEvent;
import mineplex.core.chatsnap.command.ChatSnapCommand;
import mineplex.core.message.PrivateMessageEvent;
import mineplex.core.punish.Punish;

34
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/dropper/Dropper.java
View File

@ -60,28 +60,26 @@ public class Dropper extends SoloGame
new NightVisionComponent(this);
_scoreboardComponent
.setSidebar((player, scoreboard) ->
{
scoreboard.writeNewLine();
_scoreboardComponent.setSidebar((player, scoreboard) ->
{
scoreboard.writeNewLine();
List<Player> players = getAllPlayers();
scoreboard.write(C.cYellowB + "Players");
List<Player> players = getAllPlayers();
scoreboard.write(C.cYellowB + "Players");
if (players.size() > 11)
{
scoreboard.write(players.size() + " Playing");
}
else
{
players.forEach(other -> scoreboard.write((other.equals(player) ? C.cGreen : (_completed.contains(other) ? C.cYellow : "")) + other.getName()));
}
if (players.size() > 11)
{
scoreboard.write(players.size() + " Playing");
}
else
{
players.forEach(other -> scoreboard.write((other.equals(player) ? C.cGreen : (_completed.contains(other) ? C.cYellow : "")) + other.getName()));
}
scoreboard.writeNewLine();
scoreboard.writeNewLine();
scoreboard.draw();
})
.setSetupSettingsConsumer((player, team, scoreboardTeam) -> scoreboardTeam.setCanSeeFriendlyInvisibles(false));
scoreboard.draw();
});
}
@Override

2
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/microbattle/components/MapCourruptionComponent.java
View File

@ -171,7 +171,7 @@ public class MapCourruptionComponent extends GameComponent<Game>
return Integer.compare(o1.getY(), o2.getY());
}
return Double.compare(UtilMath.offsetSquared(mid, o1.getLocation().add(0.5, 0.5, 0.5)), UtilMath.offsetSquared(mid, o2.getLocation().add(0.5, 0.5, 0.5)));
return Double.compare(UtilMath.offsetSquared(mid, o2.getLocation().add(0.5, 0.5, 0.5)), UtilMath.offsetSquared(mid, o1.getLocation().add(0.5, 0.5, 0.5)));
});
_sorted = true;
}

48
Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/parkour/Parkour.java
View File

@ -83,35 +83,33 @@ public class Parkour extends SoloGame
_spectatorComponent.setDeathOut(false);
_scoreboardComponent
.setSidebar((player, scoreboard) ->
_scoreboardComponent.setSidebar((player, scoreboard) ->
{
scoreboard.writeNewLine();
scoreboard.write(C.cYellowB + "Players");
for (ParkourPlace place : _places.subList(0, Math.min(12, _places.size())))
{
Player other = place.Parkourer;
String colour = "";
if (other.equals(player))
{
scoreboard.writeNewLine();
colour = C.cGreen;
}
else if (place.FinishedAt > 0)
{
colour = C.cYellow;
}
scoreboard.write(C.cYellowB + "Players");
scoreboard.write(colour + other.getName());
}
for (ParkourPlace place : _places.subList(0, Math.min(12, _places.size())))
{
Player other = place.Parkourer;
String colour = "";
scoreboard.writeNewLine();
if (other.equals(player))
{
colour = C.cGreen;
}
else if (place.FinishedAt > 0)
{
colour = C.cYellow;
}
scoreboard.write(colour + other.getName());
}
scoreboard.writeNewLine();
scoreboard.draw();
})
.setSetupSettingsConsumer((player, team, scoreboardTeam) -> scoreboardTeam.setCanSeeFriendlyInvisibles(false));
scoreboard.draw();
});
}
@Override