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

Upstream merge, nothing major.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 5d046da9dcfbe18c17127c4b32b1f27c1ba6c536 Mon Sep 17 00:00:00 2001
From 5412db4240e439381eca27ff3cf47c2c961e587b 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 df988f1..21462c5 100644
index 31be464..6e54ad1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1044,6 +1044,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1047,6 +1047,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);