SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shade fix accidentally being unmerged

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-04 19:57:08 +11:00
parent 74b11192c3
commit d908152b5e
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0044-Disallow-Interaction-With-Self.patch
View File

@@ -1,14 +1,14 @@
From f19bd92ec29bbbc009855d7f5eb756f09859c0f7 Mon Sep 17 00:00:00 2001
From 762df1aafc439cfc917c64c2d24dd564c1373fea 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
index 8a5e257..2e04e71 100644
index 8e80ab5..e35e7a8 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1028,6 +1028,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1030,6 +1030,13 @@ public class PlayerConnection implements PacketPlayInListener {
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);