2013-12-21 23:05:27 +00:00
|
|
|
From 69b265cf9b6035669c60bfe63e1852ea49bb5cde 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-12-21 08:13:39 +00:00
|
|
|
index 31be464..6e54ad1 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-12-21 08:13:39 +00:00
|
|
|
@@ -1047,6 +1047,13 @@ public class PlayerConnection implements PacketPlayInListener {
|
2013-12-01 03:40:53 +00:00
|
|
|
if (this.player.dead) return; // CraftBukkit
|
2013-06-28 09:53:05 +00:00
|
|
|
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
2013-12-01 03:40:53 +00:00
|
|
|
Entity entity = packetplayinuseentity.a((World) worldserver);
|
2013-06-28 09:53:05 +00:00
|
|
|
+ // Spigot Start
|
|
|
|
+ if ( entity == player )
|
|
|
|
+ {
|
|
|
|
+ disconnect( "Cannot interact with self!" );
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
|
2013-12-01 03:40:53 +00:00
|
|
|
this.player.w();
|
2013-06-28 09:53:05 +00:00
|
|
|
if (entity != null) {
|
|
|
|
--
|
2013-10-24 10:23:24 +00:00
|
|
|
1.8.3.2
|
2013-06-28 09:53:05 +00:00
|
|
|
|