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

Upstream merge: conflict resolution and version bump

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-15 17:05:45 +10:00
parent b86bbe69d4
commit 77c0da2f07
12 changed files with 64 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 2897b0b82547e474f84cd331f3485ee9c509881f Mon Sep 17 00:00:00 2001
From d4363413bc30737605f456aedc7a6f1b85e6de7b 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 4d7f5ad..07658df 100644
index c581334..662eb5a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1060,6 +1060,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1056,6 +1056,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);