Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,19 +1,19 @@
--- a/net/minecraft/world/entity/animal/EntityFish.java
+++ b/net/minecraft/world/entity/animal/EntityFish.java
@@ -68,7 +68,7 @@
@@ -59,7 +59,7 @@
@Override
public boolean isTypeNotPersistent(double d0) {
- return !this.isFromBucket() && !this.hasCustomName();
public boolean removeWhenFarAway(double d0) {
- return !this.fromBucket() && !this.hasCustomName();
+ return true; // CraftBukkit
}
@Override
@@ -90,6 +90,7 @@
@@ -81,6 +81,7 @@
@Override
public void setFromBucket(boolean flag) {
this.entityData.set(EntityFish.FROM_BUCKET, flag);
+ this.setPersistenceRequired(this.isPersistent()); // CraftBukkit - SPIGOT-4106 update persistence
+ this.setPersistenceRequired(this.isPersistenceRequired()); // CraftBukkit - SPIGOT-4106 update persistence
}
@Override