core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0530-Don-t-check-chunk-for-...

20 lines
1009 B
Diff
Raw Normal View History

Don't check chunk for portal on world gen entity add - Fixes #3780
2020-07-05 19:00:07 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 5 Jul 2020 14:59:31 -0400
Subject: [PATCH] Don't check chunk for portal on world gen entity add
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
(FIRST 1.16.3): Update Paper to 1.16.3 This is a pretty tiny update with very little changed. Recommended to update from 1.16.2 ASAP as 1.16.2 is now no longer supported. Plugins should mostly remain working as the NMS revision did not change.
2020-09-10 23:47:58 +00:00
index f9e7fd85254bfc8ed737e28060dc1014488c6b6e..76185f042dd773f267dc7574116cec7bd8a28ca8 100644
Don't check chunk for portal on world gen entity add - Fixes #3780
2020-07-05 19:00:07 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
(FIRST 1.16.3): Update Paper to 1.16.3 This is a pretty tiny update with very little changed. Recommended to update from 1.16.2 ASAP as 1.16.2 is now no longer supported. Plugins should mostly remain working as the NMS revision did not change.
2020-09-10 23:47:58 +00:00
@@ -2929,7 +2929,7 @@ public abstract class EntityLiving extends Entity {
Don't check chunk for portal on world gen entity add - Fixes #3780
2020-07-05 19:00:07 +00:00
Entity entity = this.getVehicle();
super.stopRiding(suppressCancellation); // Paper - suppress
- if (entity != null && entity != this.getVehicle() && !this.world.isClientSide) {
+ if (entity != null && entity != this.getVehicle() && !this.world.isClientSide && entity.valid) { // Paper - don't process on world gen
this.a(entity);
}