mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot 2013-12-18 17:48:18 +11:00
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0049-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From 9997f20f4bbd26fc878222eaf6f9060c18c12920 Mon Sep 17 00:00:00 2001
From 01cc08c693743327d8425587add6ca59ff6fcc17 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
@ -57,10 +57,10 @@ index af08d2f..d910e8a 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cec99a1..2492000 100644
index ef74879..06b13c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1131,6 +1131,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1133,6 +1133,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{