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

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches
This commit is contained in:
Shane Freeder
2019-03-20 01:46:00 +00:00
parent 0976d52bbd
commit ea855e2b46
332 changed files with 1073 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
View File

@@ -1,14 +1,14 @@
From 9b28a61c8f4582b4f8b024e877b09194a42429de Mon Sep 17 00:00:00 2001
From b2e44e33ca2732e58ad8b3a8e0d9e0d7e1608f74 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f543532f89..91eb73b734 100644
index b57f48035..f944eff87 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1317,7 +1317,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1301,7 +1301,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index f543532f89..91eb73b734 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8f8f03977c..43824f9633 100644
index 94770aaf7..a3e521cb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -70,5 +70,5 @@ index 8f8f03977c..43824f9633 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.20.1
2.21.0