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
|
2023-06-13 09:10:07 +02:00
|
|
|
index 9239f184f51f23a6f6373e018f9f00f05fdc92ea..9fadfb41a41b575aa1ca1c28e34118708eded498 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
|
2023-05-12 13:10:08 +02:00
|
|
|
@@ -162,6 +162,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2021-06-11 14:02:28 +02:00
|
|
|
return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
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
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
private CraftEntity bukkitEntity;
|
|
|
|
|
|
|
|
public CraftEntity getBukkitEntity() {
|
2023-06-08 07:21:04 +02:00
|
|
|
@@ -406,7 +479,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
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();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.random = SHARED_RANDOM; // Paper
|
|
|
|
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
|
2023-06-07 20:49:17 +02:00
|
|
|
index 930df3e20f27e35054620018aaec08031e6d181a..b72006c4b2342ca9d9a81f54f89fa6d979c33c85 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
|
2022-03-01 06:43:03 +01:00
|
|
|
@@ -46,7 +46,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);
|
|
|
|
- this.random.setSeed((long) this.getId());
|
|
|
|
+ //this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed
|
|
|
|
this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
|
|
|
|
}
|
|
|
|
|