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

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 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 762df1aafc439cfc917c64c2d24dd564c1373fea Mon Sep 17 00:00:00 2001
From 7b8d520d0c8aff3c622647bf434e312645c72a4c 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 8e80ab5..e35e7a8 100644
index 67c8bba..c38d48a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1030,6 +1030,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1035,6 +1035,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);