mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
20 lines
1,009 B
Diff
20 lines
1,009 B
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/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
index 7a2140e4b901027997b2884275b35b43fe2175bc..c388999d104682b84b5f0936efce9d270247d08c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
@@ -2917,7 +2917,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);
|
||
|
|
}
|
||
|
|
|