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
|
2022-06-03 04:26:56 +00:00
|
|
|
index 2b63a1cac397d80103b172477a0f3933e030e9a3..795b24ff5357a52624abc994bcfcc772ca7f5e7b 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
|
2022-03-01 05:43:03 +00:00
|
|
|
@@ -3378,7 +3378,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);
|
|
|
|
|
}
|
|
|
|
|
|
