mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 12:12:08 -07:00
Merge branch 'master' into pre/1.13
* master: Fix bug in last patch Ensure chunks are always loaded on hard position sets Improve Watchdog Early Warning Feature - Closes #1319 Allow disabling armour stand ticking
This commit is contained in:
@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..4f8d5d2d
|
||||
index 000000000..4f8d5d2db
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
Reference in New Issue
Block a user