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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0041-Disallow-Interaction-With-Self.patch
View File

@@ -1,14 +1,14 @@
From d206e513d6dcf5b1cd4278d5fb2742915385bc41 Mon Sep 17 00:00:00 2001
From 26013a2fda72d27a2a23707b8146d0a0ccb87ab6 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 08cf293..018127b 100644
index b281201..e9652a5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1037,6 +1037,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1057,6 +1057,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);
@@ -23,5 +23,5 @@ index 08cf293..018127b 100644
this.player.w();
if (entity != null) {
--
1.8.3.2
1.8.4.msysgit.0