mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-23 16:59:23 +00:00
Add back Optimize entity coordinate key
This commit is contained in:
@@ -3,8 +3,6 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|||||||
Date: Wed, 23 Nov 2022 23:32:51 +0100
|
Date: Wed, 23 Nov 2022 23:32:51 +0100
|
||||||
Subject: [PATCH] Optimize entity coordinate key
|
Subject: [PATCH] Optimize entity coordinate key
|
||||||
|
|
||||||
Removed since 1.21
|
|
||||||
|
|
||||||
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
Gale - https://galemc.org
|
Gale - https://galemc.org
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ index d98b28e9488a5a7736719cf656736bb026ec8c7e..74fe07a3737728b67987ef794103346c
|
|||||||
org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
|
org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
|
||||||
entityitem.level().getCraftServer().getPluginManager().callEvent(event);
|
entityitem.level().getCraftServer().getPluginManager().callEvent(event);
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index c869a559b67ecdfb8f9617e1f54fb9c28bb3c766..28afbf8da166377b295302e6ea7c602da70100b1 100644
|
index a52de3800a3e4b8ff6a521c8c5edcca9d49f7473..9ac3c235a7adc42af1ba22aaa4efbce5b006f98d 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -56,6 +56,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -56,6 +56,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|||||||
Gale - https://galemc.org
|
Gale - https://galemc.org
|
||||||
|
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index 28afbf8da166377b295302e6ea7c602da70100b1..f8a561d91686d6df89a7374ca223972e435978c9 100644
|
index 9ac3c235a7adc42af1ba22aaa4efbce5b006f98d..42306d45d3b8f7807b344422fca7382eec52cde2 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -25,7 +25,7 @@ index e2633083327853b87a265aab93d7eba5c5f980a7..36d009fb72351457fc238b250b097878
|
|||||||
public boolean isRealPlayer; // Paper
|
public boolean isRealPlayer; // Paper
|
||||||
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
|
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
|
||||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index 13adcb90134f03cf951c3e7eaa3123e033224df6..4ff3dbb9c1bcac000e4ed293cbc1a48aa1738e8f 100644
|
index 0563a4273f8cbb4ca9af52f6f708d43967575252..3581cd89052f6cc304bbf16ef406e6132b1a7e50 100644
|
||||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
@@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||||
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|||||||
Gale - https://galemc.org
|
Gale - https://galemc.org
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index 4ff3dbb9c1bcac000e4ed293cbc1a48aa1738e8f..f9647ce528d23743f687249ecaa6b51cfa3e62d2 100644
|
index 3581cd89052f6cc304bbf16ef406e6132b1a7e50..966c93c1fe51ff07d92b90d5e0ae0aa7a632172b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
@@ -194,6 +194,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
|
@@ -194,6 +194,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
|
||||||
@@ -49,7 +49,7 @@ index c9cabb061ebc9172647304431cc3fb2593dd47ba..68375718c4c9ba46439e49cd82a5267a
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644
|
index 42306d45d3b8f7807b344422fca7382eec52cde2..fff9f552a9b3cc4913837077857c78826bf1bdb0 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -64,7 +64,7 @@ index 0c21959f57ae88fcd0a4d6dc911c1ce347c96528..5707c6287a691030841fa973e8f7f34a
|
|||||||
entitycow.setPersistenceRequired();
|
entitycow.setPersistenceRequired();
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644
|
index fff9f552a9b3cc4913837077857c78826bf1bdb0..3fa354ceef3ec5ab9bca3f13f23aca586dfe09c4 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -65,7 +65,7 @@ index 515c1f671cb2c3a7cc23053aedf404bbbe77af3e..df002c7277a718dc156d2d5271fa4768
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644
|
index 3fa354ceef3ec5ab9bca3f13f23aca586dfe09c4..c53cb97b271ca5390b544a1af66182e3c4aefc74 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -35,7 +35,7 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644
|
index c53cb97b271ca5390b544a1af66182e3c4aefc74..266079aed0610e0fa9e35da81680b7f388a8844a 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -35,7 +35,7 @@ index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..81fdab6a5fbc39cb942f7b07a132a8f1
|
|||||||
if (!this.abilities.invulnerable) {
|
if (!this.abilities.invulnerable) {
|
||||||
if (!this.level().isClientSide) {
|
if (!this.level().isClientSide) {
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644
|
index 266079aed0610e0fa9e35da81680b7f388a8844a..e3e4459da020a85a66360e761adbf6e55920c6c5 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -42,7 +42,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||||||
index ddf47dab1ab92c45e3eea09239d418a9798ed59e..95ac8f4af849523e25b95b624d59f9f5ae5877b4 100644
|
index 9ca29b3d4bf8bca5f51f3644e12fcbec2cb5d35e..6b652424786841f147f1c55617defd0e2a994b5f 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
||||||
@@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile {
|
@@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile {
|
||||||
@@ -55,7 +55,7 @@ index ddf47dab1ab92c45e3eea09239d418a9798ed59e..95ac8f4af849523e25b95b624d59f9f5
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..d7743dc516032a7c8942bce116244e7893e79e0b 100644
|
index e3e4459da020a85a66360e761adbf6e55920c6c5..f459d398cf9e274b8551540c8a1f707bd609ecb9 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -123,6 +123,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -123,6 +123,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
|
|||||||
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
index 7349dee46483632cffa88d11694e2cd3a6fad911..93c48dd6b87d5bb7ba5a83b7c0f6c64544416bfc 100644
|
index 8e79c569eb6b49382d1335ab8a247506db6afe95..8fe992f191819f828ebc5c1986572569a09d52a9 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
@@ -314,7 +314,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
@@ -314,7 +314,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
@@ -22,7 +22,7 @@ index 7349dee46483632cffa88d11694e2cd3a6fad911..93c48dd6b87d5bb7ba5a83b7c0f6c645
|
|||||||
public double zo;
|
public double zo;
|
||||||
- private Vec3 position;
|
- private Vec3 position;
|
||||||
+ public Vec3 position; // Gale - JettPack - optimize sun burn tick - private -> public
|
+ public Vec3 position; // Gale - JettPack - optimize sun burn tick - private -> public
|
||||||
private BlockPos blockPosition;
|
public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
|
||||||
private ChunkPos chunkPosition;
|
private ChunkPos chunkPosition;
|
||||||
private Vec3 deltaMovement;
|
private Vec3 deltaMovement;
|
||||||
@@ -2061,9 +2061,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
@@ -2061,9 +2061,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||||
@@ -13,7 +13,7 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
|
|||||||
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index 1f2af396b7cddbbbb9a200bc6272309941f10e5b..b5491374f17c93310cba14a29ade7f416dd68ab4 100644
|
index bfefe93b1ab4facd4874210609ecbe244a4cff0d..0bc8711b91d81f37e65be17c3895a0dcfbe4f94e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -1576,7 +1576,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
|
@@ -1576,7 +1576,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
|
||||||
Reference in New Issue
Block a user