twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-08 16:12:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Remove no longer needed tests due to last change
This commit is contained in:
Aikar
2018-09-09 01:14:52 -04:00
parent ae158dbbc8 e0c865681c
commit f848af3df4
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/Add-More-Creeper-API.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
new file mode 100644
index 00000000..3d10bb03
index 000000000..3d10bb039
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
@@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 00000000..3d10bb03
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
index f957d836..b9877fb8 100644
index f957d8368..b9877fb88 100644
--- a/src/main/java/org/bukkit/entity/Creeper.java
+++ b/src/main/java/org/bukkit/entity/Creeper.java
@@ -0,0 +0,0 @@ public interface Creeper extends Monster {