Revert "chore: improve sendBlockUpdates"

This reverts commit 733375b.
Imprex-Development · Sep 9, 2023 · 3b3e115 · 3b3e115
1 parent 733375b
commit 3b3e115
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/...bfuscator-nms-v1_10_R1/src/main/java/net/imprex/orebfuscator/nms/v1_10_R1/NmsManager.java b/...bfuscator-nms-v1_10_R1/src/main/java/net/imprex/orebfuscator/nms/v1_10_R1/NmsManager.java
@@ -188,7 +188,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_11_R1/src/main/java/net/imprex/orebfuscator/nms/v1_11_R1/NmsManager.java b/...bfuscator-nms-v1_11_R1/src/main/java/net/imprex/orebfuscator/nms/v1_11_R1/NmsManager.java
@@ -187,7 +187,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_12_R1/src/main/java/net/imprex/orebfuscator/nms/v1_12_R1/NmsManager.java b/...bfuscator-nms-v1_12_R1/src/main/java/net/imprex/orebfuscator/nms/v1_12_R1/NmsManager.java
@@ -186,7 +186,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_13_R1/src/main/java/net/imprex/orebfuscator/nms/v1_13_R1/NmsManager.java b/...bfuscator-nms-v1_13_R1/src/main/java/net/imprex/orebfuscator/nms/v1_13_R1/NmsManager.java
@@ -176,7 +176,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_13_R2/src/main/java/net/imprex/orebfuscator/nms/v1_13_R2/NmsManager.java b/...bfuscator-nms-v1_13_R2/src/main/java/net/imprex/orebfuscator/nms/v1_13_R2/NmsManager.java
@@ -177,7 +177,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_14_R1/src/main/java/net/imprex/orebfuscator/nms/v1_14_R1/NmsManager.java b/...bfuscator-nms-v1_14_R1/src/main/java/net/imprex/orebfuscator/nms/v1_14_R1/NmsManager.java
@@ -181,7 +181,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_15_R1/src/main/java/net/imprex/orebfuscator/nms/v1_15_R1/NmsManager.java b/...bfuscator-nms-v1_15_R1/src/main/java/net/imprex/orebfuscator/nms/v1_15_R1/NmsManager.java
@@ -181,7 +181,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...bfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java b/...bfuscator-nms-v1_16_R1/src/main/java/net/imprex/orebfuscator/nms/v1_16_R1/NmsManager.java
@@ -181,7 +181,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}

diff --git a/...rebfuscator-nms-v1_9_R2/src/main/java/net/imprex/orebfuscator/nms/v1_9_R2/NmsManager.java b/...rebfuscator-nms-v1_9_R2/src/main/java/net/imprex/orebfuscator/nms/v1_9_R2/NmsManager.java
@@ -187,7 +187,7 @@ public void sendBlockUpdates(Player player, Iterable<BlockPos> iterable) {
 			} else {
 				PacketContainer packet = new PacketContainer(PacketType.Play.Server.MULTI_BLOCK_CHANGE);
 				packet.getChunkCoordIntPairs().write(0, entry.getKey());
-				packet.getMultiBlockChangeInfoArrays().write(0, blockStates.toArray(MultiBlockChangeInfo[]::new));
+				packet.getMultiBlockChangeInfoArrays().write(0, entry.getValue().toArray(MultiBlockChangeInfo[]::new));
 				serverPlayer.playerConnection.sendPacket((Packet<?>) packet.getHandle());
 			}
 		}