e886d8118e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing
19 lines
1,009 B
Diff
19 lines
1,009 B
Diff
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
|
|
index 29baae49888f030d136e99c44a5a55494606e471..91c3d5adb98f0ba004db51ea51942655ba8852c0 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -2947,7 +2947,7 @@ public abstract class EntityLiving extends Entity {
|
|
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);
|
|
}
|
|
|