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

28 lines
1.0 KiB
Diff
Raw Normal View History

2014-04-18 23:15:23 +00:00
From 2897b0b82547e474f84cd331f3485ee9c509881f Mon Sep 17 00:00:00 2001
2014-04-12 04:18:37 +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
2014-04-18 23:15:23 +00:00
index 4d7f5ad..07658df 100644
2014-04-12 04:18:37 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2014-04-18 23:15:23 +00:00
@@ -1060,6 +1060,13 @@ public class PlayerConnection implements PacketPlayInListener {
2014-04-12 04:18:37 +00:00
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);
+ // Spigot Start
+ if ( entity == player )
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
this.player.v();
if (entity != null) {
--
2014-04-18 23:15:23 +00:00
1.9.1
2014-04-12 04:18:37 +00:00