mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-08 03:39:48 +01:00
8e365012c0
Upstream Merge (Bukkit + CraftBukkit) SpigotMC/Spigot@da20125dab Plug WorldMap Memory Leak SpigotMC/Spigot@da20125dab
67 lines
3.3 KiB
Diff
67 lines
3.3 KiB
Diff
From bbdcf22da6baf9b023003bf2ba541638ba2269d8 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Mon, 21 Jul 2014 18:46:53 -0500
|
|
Subject: [PATCH] Invisible players don't have rights
|
|
|
|
Adapted from CraftBukkit PR #1319 https://github.com/Bukkit/CraftBukkit/pull/1319
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
|
index de8dda7..dbb420b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
|
@@ -220,6 +220,14 @@ public class EntityArrow extends Entity implements IProjectile {
|
|
float f2;
|
|
float f3;
|
|
|
|
+ // PaperSpigot start - Allow arrows to fly through players
|
|
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
|
|
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
|
|
+ movingobjectposition = null;
|
|
+ }
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
if (movingobjectposition != null) {
|
|
org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // CraftBukkit - Call event
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
|
|
index 7f8a33b..73f52ac 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
|
|
@@ -148,6 +148,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
|
|
}
|
|
}
|
|
|
|
+ // PaperSpigot start - Allow projectiles to fly through players the shooter can't see
|
|
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
|
|
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
|
|
+ movingobjectposition = null;
|
|
+ }
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
if (movingobjectposition != null) {
|
|
if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.b, movingobjectposition.c, movingobjectposition.d) == Blocks.PORTAL) {
|
|
this.ah();
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index a6ef3b6..7281b59 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1683,6 +1683,13 @@ public abstract class World implements IBlockAccess {
|
|
|
|
for (int i = 0; i < list.size(); ++i) {
|
|
Entity entity1 = (Entity) list.get(i);
|
|
+ // PaperSpigot start - Allow block placement if the placer cannot see the blocker
|
|
+ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
|
|
+ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ // PaperSpigot end
|
|
|
|
if (!entity1.dead && entity1.k && entity1 != entity) {
|
|
return false;
|
|
--
|
|
1.9.1
|
|
|