2020-07-05 21:00:07 +02: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
|
|
|
|
|
|
|
|
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
2021-05-02 21:37:24 +02:00
|
|
|
index 850225509a5398ddcc9335bf88e99bde662bfc91..a5b731bab16bf05351fee7e64ab6ae4d830309f7 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
2021-03-16 14:04:28 +01:00
|
|
|
@@ -3041,7 +3041,7 @@ public abstract class EntityLiving extends Entity {
|
2020-07-05 21:00:07 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|