2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 22 Mar 2016 00:33:47 -0400
|
|
|
|
Subject: [PATCH] Use a Shared Random for Entities
|
|
|
|
|
|
|
|
Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-04-12 21:14:06 +02:00
|
|
|
index 9fb52c98455d547bdde6d56689528e78a5ddfed5..52220795bf8a73c63837b4e07b1abf99c0344322 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -166,6 +166,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
2021-06-11 14:02:28 +02:00
|
|
|
return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
|
|
|
}
|
|
|
|
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper start - Share random for entities to make them more random
|
2022-06-07 21:55:39 +02:00
|
|
|
+ public static RandomSource SHARED_RANDOM = new RandomRandomSource();
|
2022-06-17 09:00:17 +02:00
|
|
|
+ private static final class RandomRandomSource extends java.util.Random implements net.minecraft.world.level.levelgen.BitRandomSource {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ private boolean locked = false;
|
2022-06-07 21:55:39 +02:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @Override
|
|
|
|
+ public synchronized void setSeed(long seed) {
|
|
|
|
+ if (locked) {
|
2022-02-28 22:43:31 +01:00
|
|
|
+ LOGGER.error("Ignoring setSeed on Entity.SHARED_RANDOM", new Throwable());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ } else {
|
|
|
|
+ super.setSeed(seed);
|
|
|
|
+ locked = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
2022-06-07 21:55:39 +02:00
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public RandomSource fork() {
|
|
|
|
+ return new net.minecraft.world.level.levelgen.LegacyRandomSource(this.nextLong());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2022-06-08 15:38:56 +02:00
|
|
|
+ public net.minecraft.world.level.levelgen.PositionalRandomFactory forkPositional() {
|
2022-06-07 21:55:39 +02:00
|
|
|
+ return new net.minecraft.world.level.levelgen.LegacyRandomSource.LegacyPositionalRandomFactory(this.nextLong());
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-17 09:00:17 +02:00
|
|
|
+ // these below are added to fix reobf issues that I don't wanna deal with right now
|
|
|
|
+ @Override
|
|
|
|
+ public int next(int bits) {
|
|
|
|
+ return super.next(bits);
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-07 21:55:39 +02:00
|
|
|
+ @Override
|
|
|
|
+ public int nextInt(int origin, int bound) {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt(origin, bound);
|
2022-06-07 21:55:39 +02:00
|
|
|
+ }
|
2022-06-08 17:43:25 +02:00
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public long nextLong() {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextLong();
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int nextInt() {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt();
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int nextInt(int bound) {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextInt(bound);
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean nextBoolean() {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextBoolean();
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public float nextFloat() {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextFloat();
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public double nextDouble() {
|
2022-06-17 09:00:17 +02:00
|
|
|
+ return net.minecraft.world.level.levelgen.BitRandomSource.super.nextDouble();
|
2022-06-08 17:43:25 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public double nextGaussian() {
|
|
|
|
+ return super.nextGaussian();
|
|
|
|
+ }
|
2022-06-07 21:55:39 +02:00
|
|
|
+ }
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper end - Share random for entities to make them more random
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
private CraftEntity bukkitEntity;
|
|
|
|
|
|
|
|
public CraftEntity getBukkitEntity() {
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -362,7 +435,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
|
2021-06-12 04:24:43 +02:00
|
|
|
this.bb = Entity.INITIAL_AABB;
|
2021-06-11 14:02:28 +02:00
|
|
|
this.stuckSpeedMultiplier = Vec3.ZERO;
|
|
|
|
this.nextStep = 1.0F;
|
2022-06-07 21:55:39 +02:00
|
|
|
- this.random = RandomSource.create();
|
2024-01-23 14:34:17 +01:00
|
|
|
+ this.random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
|
2021-06-11 14:02:28 +02:00
|
|
|
this.remainingFireTicks = -this.getFireImmuneTicks();
|
|
|
|
this.fluidHeight = new Object2DoubleArrayMap(2);
|
2022-03-01 06:43:03 +01:00
|
|
|
this.fluidOnEyes = new HashSet();
|
2021-06-12 08:24:50 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
2024-04-12 21:14:06 +02:00
|
|
|
index 1d1a4a52f3a2361688fa81ca0a2cd2e00abe652d..051fb9f1e0d91b1cb1e2dec9a03f3b26fe64c82a 100644
|
2021-06-12 08:24:50 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
|
2023-07-04 10:22:56 +02:00
|
|
|
@@ -44,7 +44,7 @@ public class Squid extends WaterAnimal {
|
2021-06-12 08:24:50 +02:00
|
|
|
|
|
|
|
public Squid(EntityType<? extends Squid> type, Level world) {
|
|
|
|
super(type, world);
|
2024-04-12 21:14:06 +02:00
|
|
|
- this.random.setSeed(this.getId());
|
|
|
|
+ //this.random.setSeed(this.getId()); // Paper - Share random for entities to make them more random
|
2021-06-12 08:24:50 +02:00
|
|
|
this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
|
|
|
|
}
|
|
|
|
|