mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 15:39:36 +02:00
"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
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/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index de5ea38fd6103cd70b646199b4e0327f981cec9f..5bba20d869463ec859ae7ac1904da7b42b98309a 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3353,7 +3353,7 @@ public abstract class LivingEntity extends Entity {
|
|
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);
|
|
}
|
|
|