testserver/CraftBukkit-Patches/0033-Disallow-Interaction-W...

28 lines
1.1 KiB
Diff
Raw Normal View History

2015-04-09 03:18:56 +00:00
From fb65daca79e2754d97955a2486f1e261b52d1292 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2015-04-05 15:09:21 +00:00
index 2ad2dc3..f772206 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2015-04-05 15:09:21 +00:00
@@ -1202,6 +1202,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
2014-11-28 01:17:45 +00:00
PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);
+ // Spigot Start
2014-11-28 01:17:45 +00:00
+ if ( entity == player && !player.v() ) // RENAME
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
2014-11-28 01:17:45 +00:00
this.player.z();
if (entity != null) {
--
2014-11-28 01:17:45 +00:00
2.1.0