PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-24 21:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix constant logging when playing on a multiplayer server that doesn't register for receiving pony data packets

Browse source
This commit is contained in:
Sollace 2023-10-24 01:12:36 +01:00
parent 011ceedafe
commit 9064272771
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/minelittlepony/api/pony/network/fabric/Channel.java
View file

@ -55,18 +55,19 @@ public class Channel {
}); });
} }
public static boolean isRegistered() {
return registered;
}
public static boolean broadcastPonyData(IPonyData packet, boolean noSkin) { public static boolean broadcastPonyData(IPonyData packet, boolean noSkin) {
if (!isRegistered()) {
return false;
}
if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) { if (FabricLoader.getInstance().getEnvironmentType() != EnvType.CLIENT) {
throw new RuntimeException("Client packet send called by the server"); throw new RuntimeException("Client packet send called by the server");
} }
if (!registered) {
LOGGER.info("Skipping network packet as the server has not consented");
return false;
} else {
LOGGER.info("Sending pony data to server for player"); LOGGER.info("Sending pony data to server for player");
}
ClientPlayNetworking.send(CLIENT_PONY_DATA, new MsgPonyData(packet, noSkin).toBuffer(PacketByteBufs.create())); ClientPlayNetworking.send(CLIENT_PONY_DATA, new MsgPonyData(packet, noSkin).toBuffer(PacketByteBufs.create()));
return true; return true;
} }

2
src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
View file

@ -140,7 +140,7 @@ public class EquineRenderManager<T extends LivingEntity, M extends EntityModel<T
@Nullable @Nullable
PlayerEntity clientPlayer = MinecraftClient.getInstance().player; PlayerEntity clientPlayer = MinecraftClient.getInstance().player;
if (pony.compareTo(synced.lastTransmittedPony) != 0) { if (Channel.isRegistered() && pony.compareTo(synced.lastTransmittedPony) != 0) {
if (clientPlayer != null && (Objects.equals(player, clientPlayer) || Objects.equals(player.getGameProfile(), clientPlayer.getGameProfile()))) { if (clientPlayer != null && (Objects.equals(player, clientPlayer) || Objects.equals(player.getGameProfile(), clientPlayer.getGameProfile()))) {
if (Channel.broadcastPonyData(pony.metadata(), pony.defaulted())) { if (Channel.broadcastPonyData(pony.metadata(), pony.defaulted())) {
synced.lastTransmittedPony = pony; synced.lastTransmittedPony = pony;