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

99 lines
5.5 KiB
Diff
Raw Normal View History

2016-03-25 04:59:37 +00:00
From b2b9a224ccc7283995a204a95171fbe3992be325 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-03-25 04:59:37 +00:00
index bd0fd80..df19327 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-02-29 23:09:49 +00:00
@@ -184,6 +184,14 @@ public abstract class EntityArrow extends Entity implements IProjectile {
}
}
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-03-25 04:59:37 +00:00
index 04fa947..140df3a 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2016-02-29 23:09:49 +00:00
@@ -198,6 +198,14 @@ public class EntityFishingHook extends Entity {
movingobjectposition = new MovingObjectPosition(entity);
}
2016-02-29 23:09:49 +00:00
+ // 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;
+ }
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
+
2016-02-29 23:09:49 +00:00
if (movingobjectposition != null) {
org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event
if (movingobjectposition.entity != null) {
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
2016-02-29 23:09:49 +00:00
index 93014a4..e0fc22b 100644
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
2016-02-29 23:09:49 +00:00
@@ -157,6 +157,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
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-02-29 23:09:49 +00:00
index 300573a..6eeb03b 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-02-29 23:09:49 +00:00
@@ -21,7 +21,7 @@ public class ItemBlock extends Item {
blockposition = blockposition.shift(enumdirection);
}
- if (itemstack.count != 0 && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, (Entity) null, itemstack)) {
+ if (itemstack.count != 0 && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, entityhuman, itemstack)) { // 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-03-25 04:59:37 +00:00
index 8221f4e..acf7ad8 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-03-25 04:59:37 +00:00
@@ -1678,6 +1678,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-03-25 04:59:37 +00:00
2.7.1.windows.2
2014-06-22 20:30:53 +00:00