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-04-03 21:12:44 +01:00
parent b07d19630a
commit fbf54955d5
25 changed files with 100 additions and 98 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 9cd01b3f2311601709147f261063dfb0a82d3b74 Mon Sep 17 00:00:00 2001
From 83cf51e11cb329bcf376392d6af7c4921a798e02 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 4c3018a..11599fc 100644
index a220aed..9c55316 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1336,6 +1336,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1358,6 +1358,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}
@@ -35,5 +35,5 @@ index 4c3018a..11599fc 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.5.2.msysgit.0