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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
7dd1cfcd PortalEvent additions

CraftBukkit Changes:
e8cb2f51 SPIGOT-5252: Nether portal fixes and additions
fde78ef3 SPIGOT-5477: Server not shutting down

Spigot Changes:
037559e7 Rebuild patches
This commit is contained in:
Shane Freeder
2020-01-13 22:12:54 +00:00
parent 654a131620
commit bd0337b7a9
17 changed files with 89 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 2646229263480c46475d417cebec9228690dfe5a Mon Sep 17 00:00:00 2001
From 013d3a8f08c00a46fea6ded0b2ccaa883310111f 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 db89bdf90f..51fb7aeced 100644
index ab2d8015a..12fa705b0 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;
@@ -17,7 +17,7 @@ index db89bdf90f..51fb7aeced 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1433,13 +1433,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1459,13 +1459,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
@@ -40,7 +40,7 @@ index db89bdf90f..51fb7aeced 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 74a0ceba64..fe26ce3af8 100644
index 74a0ceba6..fe26ce3af 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1747,8 +1747,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {