1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 22:45:31 +01:00
PaperMC/patches/server/0214-Vanished-players-don-t-have-rights.patch

110 lines
6.7 KiB
Diff
Raw Normal View History

2021-06-12 23:31:35 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
Date: Mon, 23 Jul 2018 14:22:26 +0200
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
2024-12-03 19:05:31 +01:00
index 9c36b42befab1ce490d1e8af1d8b1b032291f49f..23b7894761ef8871a7771e228b39ff01702afbcd 100644
2021-06-12 23:31:35 +02:00
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
2024-12-03 19:05:31 +01:00
@@ -372,6 +372,15 @@ public abstract class Projectile extends Entity implements TraceableEntity {
2023-03-14 19:59:51 +01:00
} else {
2021-06-12 23:31:35 +02:00
Entity entity1 = this.getOwner();
+ // Paper start - Cancel hit for vanished players
+ if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) {
+ org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
+ org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();
2023-03-14 19:59:51 +01:00
+ if (!shooter.canSee(collided)) {
+ return false;
+ }
2021-06-12 23:31:35 +02:00
+ }
+ // Paper end - Cancel hit for vanished players
2023-03-14 19:59:51 +01:00
return entity1 == null || this.leftOwner || !entity1.isPassengerOfSameVehicle(entity);
2021-06-12 23:31:35 +02:00
}
2023-03-14 19:59:51 +01:00
}
2021-06-12 23:31:35 +02:00
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
2024-12-03 19:05:31 +01:00
index 20848282d0559ded99f17c1d9a0e429db8aa9b1d..2527fea68885c6911d01cd5a9b08a347d30844c8 100644
2021-06-12 23:31:35 +02:00
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
2024-10-23 12:32:08 +02:00
@@ -168,7 +168,8 @@ public class BlockItem extends Item {
2021-06-12 23:31:35 +02:00
Player entityhuman = context.getPlayer();
2021-11-23 16:04:41 +01:00
CollisionContext voxelshapecollision = entityhuman == null ? CollisionContext.empty() : CollisionContext.of(entityhuman);
2021-06-12 23:31:35 +02:00
// CraftBukkit start - store default return
- boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && context.getLevel().isUnobstructed(state, context.getClickedPos(), voxelshapecollision);
+ Level world = context.getLevel(); // Paper - Cancel hit for vanished players
+ boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && world.checkEntityCollision(state, entityhuman, voxelshapecollision, context.getClickedPos(), true); // Paper - Cancel hit for vanished players
2021-06-12 23:31:35 +02:00
org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
2024-12-03 19:05:31 +01:00
index dd1e3fea8a6dc132b0ab7c5f9addba86ec13a6f4..09bcffea6b9510a108c5e7d2a32d2930c6abe6b3 100644
2021-06-12 23:31:35 +02:00
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
2024-12-03 19:05:31 +01:00
@@ -264,6 +264,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2023-10-27 01:34:58 +02:00
this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
2021-06-12 23:31:35 +02:00
}
+ // Paper start - Cancel hit for vanished players
2021-06-12 23:31:35 +02:00
+ // ret true if no collision
2022-12-07 19:52:24 +01:00
+ public final boolean checkEntityCollision(BlockState data, Entity source, net.minecraft.world.phys.shapes.CollisionContext voxelshapedcollision,
2021-06-12 23:31:35 +02:00
+ BlockPos position, boolean checkCanSee) {
+ // Copied from IWorldReader#a(IBlockData, BlockPosition, VoxelShapeCollision) & EntityAccess#a(Entity, VoxelShape)
2022-12-07 19:52:24 +01:00
+ net.minecraft.world.phys.shapes.VoxelShape voxelshape = data.getCollisionShape(this, position, voxelshapedcollision);
2021-06-12 23:31:35 +02:00
+ if (voxelshape.isEmpty()) {
+ return true;
+ }
+
+ voxelshape = voxelshape.move((double) position.getX(), (double) position.getY(), (double) position.getZ());
+ if (voxelshape.isEmpty()) {
+ return true;
+ }
+
+ List<Entity> entities = this.getEntities(null, voxelshape.bounds());
+ for (int i = 0, len = entities.size(); i < len; ++i) {
+ Entity entity = entities.get(i);
+
+ if (checkCanSee && source instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer
+ && !((net.minecraft.server.level.ServerPlayer) source).getBukkitEntity().canSee(((net.minecraft.server.level.ServerPlayer) entity).getBukkitEntity())) {
+ continue;
+ }
+
+ // !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
+ // elide the last check since vanilla calls with entity = null
+ // only we care about the source for the canSee check
+ if (entity.isRemoved() || !entity.blocksBuilding) {
+ continue;
+ }
+
2022-12-07 19:52:24 +01:00
+ if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
2021-06-12 23:31:35 +02:00
+ return false;
+ }
+ }
+
+ return true;
+ }
+ // Paper end - Cancel hit for vanished players
2021-06-12 23:31:35 +02:00
@Override
public boolean isClientSide() {
return this.isClientSide;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2024-10-23 12:32:08 +02:00
index 41c6a7260317ed575a3320ac36b0f2be22c120aa..474f330f381aa74e9f2fd0accdbaf2617ec1c557 100644
2021-06-12 23:31:35 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2024-10-23 12:32:08 +02:00
@@ -1327,6 +1327,14 @@ public class CraftEventFactory {
2021-06-12 23:31:35 +02:00
Projectile projectile = (Projectile) entity.getBukkitEntity();
org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
+
+ if (projectile.getShooter() instanceof Player && collided instanceof Player) {
+ if (!((Player) projectile.getShooter()).canSee((Player) collided)) {
+ event.setCancelled(true);
+ return event;
+ }
+ }
+
Bukkit.getPluginManager().callEvent(event);
return event;
}