2019-05-30 23:22:34 +00:00
|
|
|
From f987bc00c8eceaa1aa7c20a28e731c9366a74521 Mon Sep 17 00:00:00 2001
|
2018-10-17 23:30:57 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 17 Oct 2018 19:17:27 -0400
|
|
|
|
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
|
|
|
|
|
|
|
|
Say a player shoots an arrow through a nether portal, the game
|
|
|
|
would lose the shooter for determining things such as Player Kills,
|
|
|
|
because the entity is in another world.
|
|
|
|
|
|
|
|
If the projectile fails to find the shooter in the current world, check
|
|
|
|
other worlds.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
|
2019-05-27 09:13:41 +00:00
|
|
|
index c19828ed5..7deeaa083 100644
|
2018-10-17 23:30:57 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
|
2019-05-05 08:33:44 +00:00
|
|
|
@@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
|
2018-10-17 23:30:57 +00:00
|
|
|
public EntityLiving getShooter() {
|
|
|
|
if (this.shooter == null && this.shooterId != null && this.world instanceof WorldServer) {
|
|
|
|
Entity entity = ((WorldServer) this.world).getEntity(this.shooterId);
|
|
|
|
+ // Paper start - MC-50319 - shooter might be in another world (arrows through portals)
|
|
|
|
+ if (entity == null) {
|
|
|
|
+ for (WorldServer world : world.getMinecraftServer().getWorlds()) {
|
|
|
|
+ entity = world.getEntity(this.shooterId);
|
|
|
|
+ if (entity != null) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
if (entity instanceof EntityLiving) {
|
|
|
|
this.shooter = (EntityLiving) entity;
|
|
|
|
} else {
|
|
|
|
- this.shooterId = null;
|
|
|
|
+ //this.shooterId = null; // Paper - don't unset shooterId
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2019-05-05 11:32:20 +00:00
|
|
|
2.21.0
|
2018-10-17 23:30:57 +00:00
|
|
|
|