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

Update upstream B/CB/S

Browse source 
--- work/Bukkit
Submodule work/Bukkit 6eac6d70..1ef8b9d9:
  > Add Player#openBook(ItemStack) method

--- work/CraftBukkit
Submodule work/CraftBukkit 17543ecf..649921e5:
  > Add Player#openBook(ItemStack) method
  > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full
  > SPIGOT-5037: Player.openMerchant does not show merchant level
  > SPIGOT-5038: Inventory.getHolder returns null for wandering traders

--- work/Spigot
Submodule work/Spigot baafee91..df0eb250:
  > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent
  > Rebuild patches

Implementation developer note:
This patch adds a "pre-source" patch system for fixing malformed patches
from upstream directly. This seems to keep happening so it's best we
have some way to deal with them. This system brings those issues into
our domain rather than needing to wait for upstream to fix their
malformed files.
This commit is contained in:
Zach Brown 2019-06-08 15:33:05 -05:00
parent 2f782a6652
commit ef170ee659
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
44 changed files with 341 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0005-Player-affects-spawning-API.patch
View file

@ -1,14 +1,14 @@
From 457706162404fe59372fb8faa3240e9cd5d5eb92 Mon Sep 17 00:00:00 2001
From af149156929088bcfddf1bb9f7561fa6255a8be4 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8c3830cca..6568b179d 100644
index 72b08e73..f5d31648 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1462,6 +1462,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1463,6 +1463,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@NotNull
public String getLocale();