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:
42d5a714 SPIGOT-5899: Hoglins API similar to Piglins
2c1ee10e SPIGOT-5887: ClickType doesn't include off hand swaps
5ff7c7ce SPIGOT-5886: Missing BlockData

CraftBukkit Changes:
7560f5f5 SPIGOT-5905: Fix hex colours not being allowed in MOTD
d47c47ee SPIGOT-5889: Villager using composter should call EntityChangeBlockEvent
2fe6b4a3 SPIGOT-5899: Hoglins API similar to Piglins
e09dbeca SPIGOT-5887: ClickType doesn't include off hand swaps
23aac2a5 SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously
92cbf656 SPIGOT-5884: Tab completions lost on reloadData / minecraft:reload
fb4e54ad SPIGOT-5902: PlayerRespawnEvent places player at spawn before event is called
aa8f3d5a SPIGOT-5901: Structures are generated in all worlds based on the setting for the main world
a0c35937 SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect
89c0a5c3 SPIGOT-5886: Missing BlockData

Spigot Changes:
0287a20d SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously
This commit is contained in:
Aikar
2020-06-30 01:20:29 -04:00
parent e2e09326d5
commit ab347c4c96
178 changed files with 293 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
View File

@@ -34,10 +34,10 @@ index 08141147f9795546e9397abed95834ed5e69a126..d9e5d71a87140c90b79902887bd2f481
this.activeContainer = this.defaultContainer;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138ee57f92d 100644
index d2c61467b8373444609a6aad9688c5b747547d9c..dc8f88d102c06d8fb28ffd66de36f32efec54ff2 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -411,7 +411,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -408,7 +408,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// Paper end
if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -46,7 +46,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
this.activeContainer = this.defaultContainer;
}
@@ -585,7 +585,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -582,7 +582,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// SPIGOT-943 - only call if they have an inventory open
if (this.activeContainer != this.defaultContainer) {
@@ -55,7 +55,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
}
String deathMessage = event.getDeathMessage();
@@ -1166,7 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1163,7 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return OptionalInt.empty();
} else {
if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
}
this.nextContainerCounter();
@@ -1226,7 +1226,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1223,7 +1223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
}
// this.nextContainerCounter(); // CraftBukkit - moved up
@@ -1290,7 +1290,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1287,7 +1287,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void closeInventory() {
@@ -88,7 +88,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
this.o();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 351eeb83d8a28b19e3805f0d8a377f4ed060c592..027f9a86f458aab7d94f132981a9c700a0afea57 100644
index 411e6ff17ac50a410da038ad538ad56ba3aef8a8..201b2b0dcbaf6765390c18052f3b3450e63066e4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2080,7 +2080,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -114,7 +114,7 @@ index d5e7a41b39cb384cf9b52303bcbe11ae09b4162b..3a2ab5a5745e2c698042357321bcfe7b
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0c677b8e1b1a103c7d727dba19fff1f74b7ed382..8a42f9ed3e1579b8b034de9321e5545505298d6b 100644
index 10eb83bec33050ec1054de493960c87f67d4ec66..4675ddb1f7c989521dfc9fbd0367e6fbbaa7abda 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -967,7 +967,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {