testserver/Spigot-Server-Patches/0006-Vanished-players-don-t...

100 lines
5.4 KiB
Diff
Raw Normal View History

2016-11-25 03:12:18 +00:00
From c41f57a6a44ef40c5010c2fadaa6e583183c7995 Mon Sep 17 00:00:00 2001
2015-01-29 21:25:50 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
2016-02-29 23:09:49 +00:00
Date: Mon, 29 Feb 2016 21:20:21 -0600
Subject: [PATCH] Vanished players don't have rights
2014-06-22 20:30:53 +00:00
2014-06-22 20:30:53 +00:00
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
2016-11-17 02:23:38 +00:00
index ca84d92..287566c 100644
2014-06-22 20:30:53 +00:00
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
2016-11-17 02:23:38 +00:00
@@ -190,6 +190,14 @@ public abstract class EntityArrow extends Entity implements IProjectile {
2016-02-29 23:09:49 +00:00
}
}
2014-06-22 20:30:53 +00:00
2016-02-29 23:09:49 +00:00
+ // Paper start - Allow arrows to fly through vanished 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())) {
2014-06-22 20:30:53 +00:00
+ movingobjectposition = null;
+ }
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
2014-06-22 20:30:53 +00:00
+
if (movingobjectposition != null) {
2016-02-29 23:09:49 +00:00
this.a(movingobjectposition);
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
2016-11-25 03:12:18 +00:00
index bfbae25..c8837be 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2016-11-17 02:23:38 +00:00
@@ -224,6 +224,15 @@ public class EntityFishingHook extends Entity {
2016-11-17 02:23:38 +00:00
vec3d = new Vec3D(this.locX, this.locY, this.locZ);
vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ);
+
+ // Paper start - Allow fishing hooks to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && owner != null && owner instanceof EntityPlayer) {
+ if (!((EntityPlayer) owner).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null;
+ }
+ }
+ // Paper end
+
2016-11-17 02:23:38 +00:00
if (movingobjectposition != null) {
vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
2016-11-25 03:12:18 +00:00
}
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
2016-11-17 02:23:38 +00:00
index 40ac335..3d5548f 100644
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
2016-06-09 03:57:14 +00:00
@@ -160,6 +160,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
2016-02-29 23:09:49 +00:00
movingobjectposition = new MovingObjectPosition(entity);
}
2016-02-29 23:09:49 +00:00
+ // Paper start - Allow projectiles to fly through vanished 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;
+ }
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
+
if (movingobjectposition != null) {
2015-03-08 01:16:09 +00:00
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
2016-02-29 23:09:49 +00:00
this.e(movingobjectposition.a());
2015-01-07 04:13:40 +00:00
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
2016-11-17 02:23:38 +00:00
index eb32871..58ec8b5 100644
2015-01-07 04:13:40 +00:00
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
2016-11-17 02:23:38 +00:00
@@ -20,7 +20,7 @@ public class ItemBlock extends Item {
ItemStack itemstack = entityhuman.b(enumhand);
2016-02-29 23:09:49 +00:00
2016-11-17 02:23:38 +00:00
- if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, (Entity) null)) {
+ if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, entityhuman)) { // Paper - Pass entityhuman instead of null
2015-01-07 04:13:40 +00:00
int i = this.filterData(itemstack.getData());
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
2014-06-22 20:30:53 +00:00
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
2016-11-17 02:23:38 +00:00
index 78b5a3c..2a38b1c 100644
2014-06-22 20:30:53 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2016-11-17 02:23:38 +00:00
@@ -1725,6 +1725,14 @@ public abstract class World implements IBlockAccess {
2014-06-22 20:30:53 +00:00
for (int i = 0; i < list.size(); ++i) {
Entity entity1 = (Entity) list.get(i);
2014-11-28 01:17:45 +00:00
2016-02-29 23:09:49 +00:00
+ // Paper start - Allow block placement if the placer cannot see the vanished blocker
+ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
+ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
2014-06-22 20:30:53 +00:00
+ continue;
+ }
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
2014-11-28 01:17:45 +00:00
+
2016-02-29 23:09:49 +00:00
if (!entity1.dead && entity1.i && entity1 != entity && (entity == null || entity1.x(entity))) {
2014-06-22 20:30:53 +00:00
return false;
2014-11-28 01:17:45 +00:00
}
2014-06-22 20:30:53 +00:00
--
2016-11-25 03:12:18 +00:00
2.10.2.windows.1
2014-06-22 20:30:53 +00:00