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

Fix some more compile errors

Browse Source
This commit is contained in:
Spottedleaf
2019-05-05 20:53:47 -07:00
parent eeb2ecd789
commit 8dfd5dc0c4
22 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0243-Expand-Explosions-API.patch
View File

@@ -1,4 +1,4 @@
From f4d4ee382d5d7447231559f075303db9f8083f1d Mon Sep 17 00:00:00 2001
From cf6b0562373033a1db4ead73499260ed6d085f45 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Jun 2018 23:17:24 -0400
Subject: [PATCH] Expand Explosions API
@@ -6,16 +6,16 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f568538243..c4818af828 100644
index 6d0c0c5a2a..c9b11128d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -748,6 +748,11 @@ public class CraftWorld implements World {
@@ -754,6 +754,11 @@ public class CraftWorld implements World {
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
}
+ // Paper start
+ public boolean createExplosion(Entity source, Location loc, float power, boolean setFire, boolean breakBlocks) {
+ return !world.createExplosion(source != null ? ((CraftEntity) source).getHandle() : null, loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks).wasCanceled;
+ return !world.createExplosion(source != null ? ((org.bukkit.craftbukkit.entity.CraftEntity) source).getHandle() : null, loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
+ }
+ // Paper end