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

28 lines
1.1 KiB
Diff
Raw Normal View History

2022-06-08 02:00:00 +10:00
From 0a5ff45f5e9f71449cf25f28fa01f93dac245c3b 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
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
2022-06-08 02:00:00 +10:00
index 8cdeb6d7f..b7bc2dc30 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
2022-06-08 02:00:00 +10:00
@@ -2238,6 +2238,13 @@ public class PlayerConnection implements ServerPlayerConnection, PacketListenerP
2021-11-22 09:00:00 +11:00
if (this.player.isImmobile()) return; // CraftBukkit
WorldServer worldserver = this.player.getLevel();
final Entity entity = packetplayinuseentity.getTarget(worldserver);
2014-04-12 14:18:37 +10:00
+ // 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
2021-11-22 09:00:00 +11:00
this.player.resetLastActionTime();
this.player.setShiftKeyDown(packetplayinuseentity.isUsingSecondaryAction());
2014-04-12 14:18:37 +10:00
--
2.25.1
2014-04-12 14:18:37 +10:00