Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0223-Added-the-ability-to-add-combustible-items.patch
View File

@@ -51,10 +51,10 @@ index 800c80398acb007ae71b06d1a887aa159e866eda..abb90af5eb73eb9c4c73f52feef9a29c
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6b9def09a1f7ccd6370c960723dea079addddeb5..41be109438f5cadebcf3088ff8cb6bdde2c1044b 100644
index e0026d35131fa0b7029a9d23bda22bf27c234744..988fdfae38f0e9f472a7a5fddcf41a25484bafbe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1405,6 +1405,19 @@ public final class CraftServer implements Server {
@@ -1404,6 +1404,19 @@ public final class CraftServer implements Server {
return true;
}