Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 00:47:38 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6113: Ender Pearls thrown into portals that lead to disabled dimensions crash the server

Browse Source
This commit is contained in:
Martoph 2020-08-28 12:28:06 +10:00 committed by md_5
parent 97da39889c
commit e14c9acbec
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nms-patches/EntityEnderPearl.patch
View File

@ -60,3 +60,12 @@
}
} else if (entity != null) {
entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());
@@ -80,7 +100,7 @@
public Entity b(WorldServer worldserver) {
Entity entity = this.getShooter();
- if (entity != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) {
+ if (entity != null && worldserver != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) { // CraftBukkit - SPIGOT-6113
this.setShooter((Entity) null);
}