Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Forgot to use consumer on the cached packet as well, update upstream

Browse Source
This commit is contained in:
Cryptite
2023-05-03 08:41:57 -05:00
parent 550c12f16a
commit 6c2091b610
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=com.lokamc.slice
version=1.19.4-R0.1-SNAPSHOT version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.4 mcVersion=1.19.4
paperRef=4f9575eed827007f31ce17da471820fe8bc14573 paperRef=9846d0d89e7598fc28a8c8534d80d4c5dc42021c
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

4
patches/server/0021-Equipment-Packet-Caching.patch
View File

@@ -173,7 +173,7 @@ index 5813349d484cf40c5b75de6e55dff95286285934..e24b0871819add31e00e1e3d782fda31
// Paper start - helper function for configurable spawn radius // Paper start - helper function for configurable spawn radius
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 72739d5949314b242869fd5fef3b5f0c076434d0..997ba564bb45484aa67e72cdabf7d09313843e64 100644 index 72739d5949314b242869fd5fef3b5f0c076434d0..8fad6542fa814a6d35a90970119c88d054b5cd3f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -261,6 +261,8 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -261,6 +261,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -256,7 +256,7 @@ index 72739d5949314b242869fd5fef3b5f0c076434d0..997ba564bb45484aa67e72cdabf7d093
+ ClientboundSetEquipmentPacket equipmentPacket = player.cachedEquipmentMap.get(tag); + ClientboundSetEquipmentPacket equipmentPacket = player.cachedEquipmentMap.get(tag);
+ if (equipmentPacket != null) { + if (equipmentPacket != null) {
+ //Event says use a tag, and our tag exists; so we simply used our entire cached packet + //Event says use a tag, and our tag exists; so we simply used our entire cached packet
+ p.connection.send(equipmentPacket); + consumer.accept(equipmentPacket);
+ sendEquipment = false; + sendEquipment = false;
+ } + }
+ } + }