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

28 lines
1.1 KiB
Diff
Raw Normal View History

2018-07-22 12:00:00 +10:00
From 2a25da41d8fdf80013d67fc6c409abe2d92e0d99 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
2018-07-22 12:00:00 +10:00
index b32d4c755..2689186e5 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
2018-07-20 16:13:18 +10:00
@@ -1723,6 +1723,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
2016-11-17 12:41:12 +11:00
if (this.player.isFrozen()) 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) {
--
2018-07-15 10:00:00 +10:00
2.17.1
2014-04-12 14:18:37 +10:00