PaperMC/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch

28 lines
1.1 KiB
Diff
Raw Normal View History

2016-02-29 22:33:06 +01:00
From 7f19d7e7e7ded0f3a6287ce0587e62ad5bfeb544 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
2016-02-29 22:33:06 +01:00
index c13a2be..f785d9f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-02-29 22:33:06 +01:00
@@ -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
2015-05-09 22:23:26 +02:00
+ if ( entity == player && !player.isSpectator() )
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
2015-05-09 22:23:26 +02:00
this.player.resetIdleTimer();
if (entity != null) {
--
2016-02-29 22:33:06 +01:00
2.5.0