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

28 lines
1.1 KiB
Diff
Raw Normal View History

2016-09-05 17:35:26 +10:00
From b5a9056aab04c7cf19bd4e05a6ecdef8ac31dc96 Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10: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
2016-09-05 17:35:26 +10:00
index 2521603..79fc9e6 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2016-06-23 10:37:05 +10:00
@@ -1446,6 +1446,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
2016-09-05 17:35:26 +10:00
if (this.player.cj()) return; // CraftBukkit
2014-04-12 14:18:37 +10:00
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);
+ // Spigot Start
2015-05-09 21:23:26 +01:00
+ if ( entity == player && !player.isSpectator() )
2014-04-12 14:18:37 +10:00
+ {
+ disconnect( "Cannot interact with self!" );
+ return;
+ }
+ // Spigot End
2015-05-09 21:23:26 +01:00
this.player.resetIdleTimer();
2014-04-12 14:18:37 +10:00
if (entity != null) {
--
2016-05-10 21:48:25 +10:00
2.7.4
2014-04-12 14:18:37 +10:00