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

[Auto] Updated Upstream (Bukkit/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

Bukkit Changes:
d75d8a38 #549: Add Fluid types / tags

CraftBukkit Changes:
890130b46 #746: Add Fluid types / tags
This commit is contained in:
Aikar
2020-09-14 05:57:06 -04:00
parent d35903e6fa
commit 613bdc3f96
38 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb544a8d41e3 100644
index 2eb2c0c93b0d67ad7474e37158dab44018c9cbac..3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -104,6 +104,7 @@ import net.minecraft.server.WorldNBTStorage;
@@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage;
import net.minecraft.server.WorldServer;
import net.minecraft.server.WorldSettings;
import org.apache.commons.lang.Validate;
@@ -16,7 +16,7 @@ index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb54
import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -176,6 +177,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -178,6 +179,7 @@ import org.bukkit.craftbukkit.util.Versioning;
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb54
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.server.BroadcastMessageEvent;
@@ -784,7 +786,13 @@ public final class CraftServer implements Server {
@@ -786,7 +788,13 @@ public final class CraftServer implements Server {
// Spigot start
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {