mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
Don't check chunk for portal on world gen entity add - Fixes #3780
This commit is contained in:
parent
4293d08afb
commit
4ca3d61623
@ -0,0 +1,19 @@
|
||||
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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user