From 0893d230e7e397e4827005b8c8ed13d6501b6f2f Mon Sep 17 00:00:00 2001 From: Patbox <39821509+Patbox@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:01:09 +0100 Subject: [PATCH] Update to 1.20.4 --- gradle.properties | 10 +++++----- .../voxxin/blockhunt/game/BlockHuntPlayer.java | 2 +- .../mixin/ServerPlayerNetworkHandlerMixin.java | 14 ++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d3880d..9560ea9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop/ - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.10 - loader_version=0.14.21 - fabric_version=0.86.1+1.20.1 + minecraft_version=1.20.4 + yarn_mappings=1.20.4+build.1 + loader_version=0.15.6 + fabric_version=0.91.1+1.20.4 # check this on https://nucleoid.xyz/use/ - plasmid_version=0.5.101-SNAPSHOT+1.20.1 \ No newline at end of file + plasmid_version=0.5.102-SNAPSHOT+1.20.4 \ No newline at end of file diff --git a/src/main/java/com/github/voxxin/blockhunt/game/BlockHuntPlayer.java b/src/main/java/com/github/voxxin/blockhunt/game/BlockHuntPlayer.java index 11682fc..36637be 100644 --- a/src/main/java/com/github/voxxin/blockhunt/game/BlockHuntPlayer.java +++ b/src/main/java/com/github/voxxin/blockhunt/game/BlockHuntPlayer.java @@ -41,7 +41,7 @@ public BlockHuntPlayer(ServerWorld world, PlayerRef player) { } public void setTeam(Team team) { - world.getScoreboard().addPlayerToTeam(player.getEntityName(), team); + world.getScoreboard().addScoreHolderToTeam(player.getNameForScoreboard(), team); this.team = team; } diff --git a/src/main/java/com/github/voxxin/blockhunt/game/mixin/ServerPlayerNetworkHandlerMixin.java b/src/main/java/com/github/voxxin/blockhunt/game/mixin/ServerPlayerNetworkHandlerMixin.java index 11d7ab5..33617cd 100644 --- a/src/main/java/com/github/voxxin/blockhunt/game/mixin/ServerPlayerNetworkHandlerMixin.java +++ b/src/main/java/com/github/voxxin/blockhunt/game/mixin/ServerPlayerNetworkHandlerMixin.java @@ -5,6 +5,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.EntityEquipmentUpdateS2CPacket; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerCommonNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -14,18 +15,15 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(ServerPlayNetworkHandler.class) +@Mixin(ServerCommonNetworkHandler.class) public class ServerPlayerNetworkHandlerMixin { - @Shadow @Final private MinecraftServer server; - - @Shadow public ServerPlayerEntity player; - - @Inject(at = @At("HEAD"), method = "sendPacket(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;)V", cancellable = true) + @Inject(at = @At("HEAD"), method = "send", cancellable = true) public void sendPacket(Packet packet, PacketCallbacks callbacks, CallbackInfo ci) { - if (packet instanceof EntityEquipmentUpdateS2CPacket entityEquipmentUpdateS2CPacket) { + //noinspection ConstantValue + if (packet instanceof EntityEquipmentUpdateS2CPacket entityEquipmentUpdateS2CPacket && ((Object) this) instanceof ServerPlayNetworkHandler handler) { int packetID = entityEquipmentUpdateS2CPacket.getId(); - if (this.player.getServerWorld().getPlayers().stream().noneMatch(p -> p.getId() == packetID)) { ci.cancel(); } + if (handler.player.getServerWorld().getPlayers().stream().noneMatch(p -> p.getId() == packetID)) { ci.cancel(); } if (BlockHunt.deniedIDs.contains(packetID)) { ci.cancel(); } }