28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 7cbd31d918c0c0fe968f41c1bde0c971694f7ac6 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
|
|
index 785372f..57d74b1 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1397,6 +1397,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
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 && !player.isSpectator() )
|
|
+ {
|
|
+ disconnect( "Cannot interact with self!" );
|
|
+ return;
|
|
+ }
|
|
+ // Spigot End
|
|
|
|
this.player.resetIdleTimer();
|
|
if (entity != null) {
|
|
--
|
|
2.5.0
|
|
|