mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
20 lines
1 KiB
Diff
20 lines
1 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 cec1e6105b8c2ac3d1482c00482d53d6be0d38d1..9724d4222311345a44aa101ec47523a1909fbe8f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -3038,7 +3038,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);
|
||
|
|
}
|
||
|
|
|