Skip to content

Commit 80beee5

Browse files
committed
[KillTheRNG] Fix GlobalRandomness not advancing correctly
1 parent a3a1436 commit 80beee5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/main/java/com/minecrafttas/tasmod/ktrng/EntityRandomness.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
public class EntityRandomness extends RandomBase {
66

7+
public static long entityCount = 0;
8+
79
public EntityRandomness() {
810
super(TASmod.globalRandomness.getCurrentSeed());
911
}

src/main/java/com/minecrafttas/tasmod/ktrng/GlobalRandomnessTimer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public GlobalRandomnessTimer() {
1616

1717
@Override
1818
public void onServerTick(MinecraftServer server) {
19-
currentSeed = globalRandomness.nextLong();
19+
globalRandomness.advance();
20+
currentSeed = globalRandomness.getSeed();
2021
}
2122

2223
public long getCurrentSeed() {

src/main/java/com/minecrafttas/tasmod/ktrng/KTRNGWorldHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public static void setWorldRandomnessMap(Map<Integer, WorldRandomness> randomnes
3333
}
3434

3535
public static String getWorldRandom() {
36-
return Long.toString(((WorldRandomness) TASmod.getServerInstance().worlds[0].rand).getSeed());
36+
if (TASmod.getServerInstance().worlds[0] != null)
37+
return Long.toString(((WorldRandomness) TASmod.getServerInstance().worlds[0].rand).getSeed());
38+
else
39+
return "";
3740
}
3841
}

src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import com.minecrafttas.mctcommon.KeybindManager.IsKeyDownFunc;
66
import com.minecrafttas.mctcommon.KeybindManager.Keybind;
77
import com.minecrafttas.mctcommon.KeybindManager.KeybindID;
8-
import com.minecrafttas.tasmod.TASmod;
98
import com.minecrafttas.tasmod.TASmodClient;
10-
import com.minecrafttas.tasmod.ktrng.RandomBase;
119
import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
1210
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
1311
import com.minecrafttas.tasmod.virtual.VirtualKeybindings;
@@ -48,10 +46,6 @@ public enum TASmodKeybinds implements KeybindID {
4846
TASmodClient.virtual.CAMERA_ANGLE.updateNextCameraAngle(0, 45);
4947
}),
5048
TEST1("Various Testing", "TASmod", Keyboard.KEY_F12, () -> {
51-
TASmod.getServerInstance().getEntityWorld().loadedEntityList.forEach(entity -> {
52-
RandomBase rand = (RandomBase) entity.rand;
53-
rand.setSeed(0);
54-
});
5549
}, VirtualKeybindings::isKeyDown),
5650
TEST2("Various Testing2", "TASmod", Keyboard.KEY_F7, () -> {
5751
}, VirtualKeybindings::isKeyDown);

0 commit comments

Comments
 (0)