BLOCKFANTASY/LimboService
1
0
Fork 0
forked from BLOCKFANTASY/LOOHP-Limbo
Code Pull Requests Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
LOOHP
2021-11-24 17:13:59 +00:00
committed by GitHub
parent 120f9dce3f d86bcdb48d
commit 0fcab21a4d
14 changed files with 94 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/loohp/limbo/player/Player.java
+20 -10
View File
@@ -25,9 +25,12 @@ import com.loohp.limbo.utils.GameMode;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import net.md_5.bungee.chat.ComponentSerializer;
public class Player extends LivingEntity implements CommandSender {
public static final String CHAT_DEFAULT_FORMAT = "<%name%> %message%";
public final ClientConnection clientConnection;
public final PlayerInteractManager playerInteractManager;
@@ -201,7 +204,7 @@ public class Player extends LivingEntity implements CommandSender {
}
public void sendMessage(BaseComponent component, UUID uuid) {
sendMessage(new BaseComponent[] { component }, uuid);
sendMessage(new BaseComponent[] {component}, uuid);
}
@Override
@@ -219,7 +222,7 @@ public class Player extends LivingEntity implements CommandSender {
}
public void sendMessage(BaseComponent component) {
sendMessage(new BaseComponent[] { component });
sendMessage(new BaseComponent[] {component});
}
@Override
@@ -233,7 +236,7 @@ public class Player extends LivingEntity implements CommandSender {
}
public void disconnect() {
disconnect("Disconnected!");
disconnect(new TranslatableComponent("multiplayer.disconnect.kicked"));
}
public void disconnect(String reason) {
@@ -250,24 +253,31 @@ public class Player extends LivingEntity implements CommandSender {
public void chat(String message) {
if (Limbo.getInstance().getServerProperties().isAllowChat()) {
String format = "<%name%> %message%";
PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, format, message, false));
PlayerChatEvent event = (PlayerChatEvent) Limbo.getInstance().getEventsManager().callEvent(new PlayerChatEvent(this, CHAT_DEFAULT_FORMAT, message, false));
if (!event.isCancelled() && this.hasPermission("limboserver.chat")) {
String chat = event.getFormat().replace("%name%", username).replace("%message%", event.getMessage());
Limbo.getInstance().getConsole().sendMessage(chat);
for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(chat, uuid);
if (event.getFormat().equals(CHAT_DEFAULT_FORMAT)) {
TranslatableComponent translatable = new TranslatableComponent("chat.type.text", username, event.getMessage());
for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(translatable, uuid);
}
} else {
for (Player each : Limbo.getInstance().getPlayers()) {
each.sendMessage(chat, uuid);
}
}
}
}
}
public void setResourcePack(String url, String hash, boolean forced, BaseComponent promptmessage) {
setResourcePack(url, hash, forced, new BaseComponent[] {promptmessage});
}
public void setResourcePack(String url, String hash, boolean forced, BaseComponent[] promptmessage) {
try {
PacketPlayOutResourcePackSend packsend = new PacketPlayOutResourcePackSend(url, hash, forced,
(promptmessage != null || !ComponentSerializer.toString(promptmessage).equalsIgnoreCase("")) ? true : false,
ComponentSerializer.toString(promptmessage));
PacketPlayOutResourcePackSend packsend = new PacketPlayOutResourcePackSend(url, hash, forced, promptmessage != null, promptmessage != null ? promptmessage : null);
clientConnection.sendPacket(packsend);
} catch (IOException e) {
e.printStackTrace();