Make BlockInventoryHolder block strings immutable; clean up lectern u…

…nloading
bundabrg · Feb 17, 2021 · 22c39d2 · 22c39d2
1 parent 72186d9
commit 22c39d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...ava/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java b/...ava/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java
@@ -26,7 +26,7 @@
 package org.geysermc.connector.network.translators.inventory.holder;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
@@ -40,6 +40,7 @@
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -58,8 +59,10 @@ public BlockInventoryHolder(String javaBlockIdentifier, ContainerType containerT
         this.defaultJavaBlockState = BlockTranslator.getJavaBlockState(javaBlockIdentifier);
         this.containerType = containerType;
         if (validBlocks != null) {
-            this.validBlocks = Sets.newHashSet(validBlocks);
-            this.validBlocks.add(javaBlockIdentifier.split("\\[")[0]);
+            Set<String> validBlocksTemp = new HashSet<>(validBlocks.length + 1);
+            Collections.addAll(validBlocksTemp, validBlocks);
+            validBlocksTemp.add(javaBlockIdentifier.split("\\[")[0]);
+            this.validBlocks = ImmutableSet.copyOf(validBlocksTemp);
         } else {
             this.validBlocks = Collections.singleton(javaBlockIdentifier.split("\\[")[0]);
         }

diff --git a/...java/org/geysermc/connector/network/translators/java/world/JavaUnloadChunkTranslator.java b/...java/org/geysermc/connector/network/translators/java/world/JavaUnloadChunkTranslator.java
@@ -54,7 +54,7 @@ public void translate(ServerUnloadChunkPacket packet, GeyserSession session) {
         iterator = session.getLecternCache().iterator();
         while (iterator.hasNext()) {
             Vector3i position = iterator.next();
-            if (Math.floor((double) position.getX() / 16) == packet.getX() && Math.floor((double) position.getZ() / 16) == packet.getZ()) {
+            if ((position.getX() >> 4) == packet.getX() && (position.getZ() >> 4) == packet.getZ()) {
                 iterator.remove();
             }
         }