From f2f04407a4f3b9c98c86f6c71e4ce1f68471ceca Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Sat, 22 Dec 2018 23:24:11 -0800
Subject: [PATCH] Add the sender to NetworkEvent.Context for server-side event
 handlers (#5295)

---
 .../fml/network/NetworkEvent.java             | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java b/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java
index f36d0e50f1..3bf2faafcb 100644
--- a/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java
+++ b/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java
@@ -19,9 +19,15 @@
 
 package net.minecraftforge.fml.network;
 
+import javax.annotation.Nullable;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.IThreadListener;
@@ -170,6 +176,21 @@ public class NetworkEvent extends Event
             return (ListenableFuture<V>)LogicalSidedProvider.WORKQUEUE.<IThreadListener>get(getDirection().getLogicalSide()).addScheduledTask(runnable);
         }
 
+        /**
+         * When available, gets the sender for packets that are sent from a client to the server.
+         */
+        @Nullable
+        public EntityPlayerMP getSender()
+        {
+            INetHandler netHandler = networkManager.getNetHandler();
+            if (netHandler instanceof NetHandlerPlayServer)
+            {
+                NetHandlerPlayServer netHandlerPlayServer = (NetHandlerPlayServer) netHandler;
+                return netHandlerPlayServer.player;
+            }
+            return null;
+        }
+
         NetworkManager getNetworkManager() {
             return networkManager;
         }