Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
d208733e SPIGOT-5509: Sleeping player does not eject bed when teleported
This commit is contained in:
Shane Freeder
2020-01-11 13:34:00 +00:00
parent f5569fd3d8
commit c1f57657ee
19 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch
View File

@@ -1,11 +1,11 @@
From 9c25b107e1d3984feaf5f7b81a89c3d6f5cd47a0 Mon Sep 17 00:00:00 2001
From 2646229263480c46475d417cebec9228690dfe5a Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index db89bdf90..51fb7aece 100644
index db89bdf90f..51fb7aeced 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@@ -40,10 +40,10 @@ index db89bdf90..51fb7aece 100644
this.ci = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bq, (byte) packetplayinsettings.f());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 09213efa1..6cf85f070 100644
index 74a0ceba64..fe26ce3af8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1742,8 +1742,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
@@ -56,7 +56,7 @@ index 09213efa1..6cf85f070 100644
}
// Paper start
@@ -1830,7 +1832,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1835,7 +1837,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}