45 lines
2.3 KiB
Diff
45 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Allink <arclicious@vivaldi.net>
|
|
Date: Wed, 5 Jul 2023 22:58:24 +0100
|
|
Subject: [PATCH] Limit save data for Bees and Vexes
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
index 9a7956befc346e1b58f064213800fd099a052fc6..2ebedd806bafc6ff7c4bf5a962ead50ce2ad1a8a 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
|
|
@@ -227,8 +227,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
|
|
@Override
|
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
|
this.hivePos = null;
|
|
- if (nbt.contains("HivePos")) {
|
|
- this.hivePos = NbtUtils.readBlockPos(nbt.getCompound("HivePos"));
|
|
+ if (nbt.contains("HivePos"))
|
|
+ {
|
|
+ // Scissors start - Limit HivePos
|
|
+ final BlockPos savedHivePos = NbtUtils.readBlockPos(nbt.getCompound("HivePos"));
|
|
+ this.hivePos = this.level().isLoadedAndInBounds(savedHivePos) ? savedHivePos : null;
|
|
+ // Scissors end - Limit HivePos
|
|
}
|
|
|
|
this.savedFlowerPos = null;
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
|
index 90e577b1a89b02c38daff2845a63dafe5ed929e1..1a2b6ee032ab6952634c9f596820db3e7374fb50 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
|
|
@@ -118,8 +118,12 @@ public class Vex extends Monster implements TraceableEntity {
|
|
@Override
|
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
|
super.readAdditionalSaveData(nbt);
|
|
- if (nbt.contains("BoundX")) {
|
|
- this.boundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
|
|
+ if (nbt.contains("BoundX"))
|
|
+ {
|
|
+ // Scissors start - Limit Vex bound origin
|
|
+ final BlockPos savedBoundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
|
|
+ this.boundOrigin = this.level().isLoadedAndInBounds(savedBoundOrigin) ? savedBoundOrigin : null;
|
|
+ // Scissors end - Limit Vex bound origin
|
|
}
|
|
|
|
if (nbt.contains("LifeTicks")) {
|