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

Remove extra inventory close event patch, because despite being a legitimate bug fix, it will not be pulled by Bukkit, so plugins must resort to other means to catch this last event.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-23 11:37:51 +10:00
parent cde5a715a3
commit 9ef540adb1
32 changed files with 32 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
View File

@@ -1,30 +0,0 @@
From 1d22c36f1f307d7ea7888e4dd20a4529363f95db Mon Sep 17 00:00:00 2001
From: EdGruberman <ed@rjump.com>
Date: Tue, 12 Feb 2013 16:17:31 -0700
Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
BUKKIT-3604
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index da7ad33..eaeb0bf 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -493,7 +493,14 @@ public abstract class PlayerList {
if (exitWorld != null) {
if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
// THE_END -> NORMAL; use bed if available, otherwise default spawn
- exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
+ ChunkCoordinates chunkcoordinates = entityplayer.getBed();
+ CraftWorld spawnWorld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
+ if (spawnWorld != null && chunkcoordinates != null) {
+ ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(spawnWorld.getHandle(), chunkcoordinates, entityplayer.isRespawnForced());
+ if (chunkcoordinates1 != null) {
+ exit = new Location(spawnWorld, chunkcoordinates1.x + 0.5, chunkcoordinates1.y, chunkcoordinates1.z + 0.5);
+ }
+ }
if (exit == null || ((CraftWorld) exit.getWorld()).getHandle().dimension != 0) {
exit = exitWorld.getWorld().getSpawnLocation();
}
--
1.8.2.1