geforkt von Mirrors/Paper
Invisible players don't have rights
Dieser Commit ist enthalten in:
Ursprung
5537db04fc
Commit
990862afb7
64
CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch
Normale Datei
64
CraftBukkit-Patches/0153-Invisible-players-don-t-have-rights.patch
Normale Datei
@ -0,0 +1,64 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
||||
Date: Sun, 18 May 2014 16:35:38 -0500
|
||||
Subject: [PATCH] Invisible players don't have rights
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
@@ -0,0 +0,0 @@ package net.minecraft.server;
|
||||
import java.util.List;
|
||||
|
||||
// CraftBukkit start
|
||||
+import org.bukkit.craftbukkit.entity.CraftPlayer; // PaperSpigot
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
||||
import org.bukkit.event.player.PlayerPickupItemEvent;
|
||||
@@ -0,0 +0,0 @@ public class EntityArrow extends Entity implements IProjectile {
|
||||
float f2;
|
||||
float f3;
|
||||
|
||||
+ // PaperSpigot start - Allow projectiles and arrows to pass through players the shooter can't see
|
||||
+ if(movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
|
||||
+ CraftPlayer playerBlocking = ((EntityPlayer) movingobjectposition.entity).getBukkitEntity();
|
||||
+ CraftPlayer playerShooter = ((EntityPlayer)shooter).getBukkitEntity();
|
||||
+ if(!playerShooter.canSee(playerBlocking)) {
|
||||
+ 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/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -0,0 +0,0 @@ import java.util.concurrent.Callable;
|
||||
// CraftBukkit start
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.block.BlockState;
|
||||
+import org.bukkit.craftbukkit.entity.CraftPlayer; // PaperSpigot
|
||||
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
||||
import org.bukkit.craftbukkit.util.LongHashSet;
|
||||
import org.bukkit.craftbukkit.SpigotTimings; // Spigot
|
||||
@@ -0,0 +0,0 @@ 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 when the player can't see an invisible player
|
||||
+ if (entity != null && entity instanceof EntityPlayer && entity1 != null && entity1 instanceof EntityPlayer) {
|
||||
+ CraftPlayer placer = ((EntityPlayer)entity).getBukkitEntity();
|
||||
+ CraftPlayer blocking = ((EntityPlayer)entity1).getBukkitEntity();
|
||||
+ if(!placer.canSee(blocking)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ }
|
||||
+ // PaperSpigot end
|
||||
|
||||
if (!entity1.dead && entity1.k && entity1 != entity) {
|
||||
return false;
|
||||
--
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren