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

Merge some stuff from upstream.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-02 17:54:35 +11:00
parent 04c83ec337
commit c936739c09
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch
View File

@@ -1,4 +1,4 @@
From 0c72b73039ba352ba54357abae4110541b274f42 Mon Sep 17 00:00:00 2001
From 9cd01b3f2311601709147f261063dfb0a82d3b74 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
@@ -18,10 +18,10 @@ index c1caca7..ca06f60 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7a96a3f..23d9612 100644
index 4c3018a..11599fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1335,6 +1335,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1336,6 +1336,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}
@@ -35,5 +35,5 @@ index 7a96a3f..23d9612 100644
public Player.Spigot spigot()
--
1.8.5.2.msysgit.0
1.8.3.2