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

28 lines
971 B
Diff
Raw Normal View History

From 8d414631b4347cfcf8ac81810462f80147f1a8d2 Mon Sep 17 00:00:00 2001
2013-06-28 09:53:05 +00:00
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
2013-09-20 01:46:45 +00:00
index 3c03d5a..10d853b 100644
2013-06-28 09:53:05 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2013-09-20 01:46:45 +00:00
@@ -1087,6 +1087,13 @@ public class PlayerConnection extends Connection {
2013-06-28 09:53:05 +00:00
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = worldserver.getEntity(packet7useentity.target);
+ // Spigot Start
+ if ( entity == player )
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
2013-09-20 01:46:45 +00:00
this.player.u();
2013-06-28 09:53:05 +00:00
if (entity != null) {
--
1.8.1.2