Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-06 15:41:49 +00:00
Code Issues Releases Activity

Remove unused utility

Browse Source
This commit is contained in:
Samsuik
2023-10-29 16:16:21 +00:00
parent 45042887ff
commit 5e596f7fc2
1 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0018-Merge-Cannon-Entities.patch
View File

@@ -165,42 +165,6 @@ index 0000000000000000000000000000000000000000..794547b36f0780b4dd300fc162cd9b70
+ }
+
+}
diff --git a/src/main/java/me/samsuik/sakura/utils/collections/EntityTable.java b/src/main/java/me/samsuik/sakura/utils/collections/EntityTable.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f43264f436f5cea06b892e11b7f4864d321c49e
--- /dev/null
+++ b/src/main/java/me/samsuik/sakura/utils/collections/EntityTable.java
@@ -0,0 +1,30 @@
+package me.samsuik.sakura.utils.collections;
+
+import it.unimi.dsi.fastutil.HashCommon;
+import net.minecraft.world.entity.Entity;
+
+import java.util.Arrays;
+
+public class EntityTable {
+
+ private final Entity[] entities;
+ private final int mask;
+
+ public EntityTable(int capacity) {
+ capacity = HashCommon.nextPowerOfTwo(capacity - 1);
+ entities = new Entity[capacity];
+ mask = capacity - 1;
+ }
+
+ public Entity put(Entity entity) {
+ var pos = entity.blockPosition().hashCode() & mask;
+ var found = entities[pos];
+ entities[pos] = entity;
+ return found;
+ }
+
+ public void clear() {
+ Arrays.fill(entities, null);
+ }
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index eef411f838ecdeff0d4052fac22900e4ad87ceb5..4bc68b3145f42f5a432e1e897b3f41606735afd1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -242,7 +206,7 @@ index bc73d8625ac296372640f540ade170aed8ae5353..04afadf047b84492dddd5ecc39e116ca
this.guardEntityTick(this::tickNonPassenger, entity);
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7e906ad87ae48942445b6ad1fa22ab9442c8943e..311891f079d2136a18f62478bd289c91ff515772 100644
index 3757e3e77a567187e0f9cb60cb10a95bec330693..31e9e180ecddefc99d0984e793682f40258af3fb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -559,6 +559,105 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {