20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
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/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
index 13896da2194cab683782504291ede6f135ca7279..60dfa764898b59b60aec2da9580a80634e624dbe 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
@@ -3041,7 +3041,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);
|
||
|
|
}
|
||
|
|
|