2021-06-11 12:02:28 +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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2021-06-16 00:50:38 +00:00
|
|
|
index 88e289cbd8bbf06bd7d7a911b990c4c780232ac4..d9f867b2d3688c3b5e5ed1d754e3d1d1567af383 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2021-06-15 22:24:12 +00:00
|
|
|
@@ -3352,7 +3352,7 @@ public abstract class LivingEntity extends Entity {
|
2021-06-11 12:02:28 +00:00
|
|
|
Entity entity = this.getVehicle();
|
|
|
|
|
|
|
|
|
|
super.stopRiding(suppressCancellation); // Paper - suppress
|
|
|
|
|
- if (entity != null && entity != this.getVehicle() && !this.level.isClientSide) {
|
|
|
|
|
+ if (entity != null && entity != this.getVehicle() && !this.level.isClientSide && entity.valid) { // Paper - don't process on world gen
|
|
|
|
|
this.dismountVehicle(entity);
|
|
|
|
|
}
|
|
|
|
|
|
