mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
57 changed files with 380 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0112-Expand-Explosions-API.patch
View file

@ -1,4 +1,4 @@
From ef5875eebd65341d8a1651738ca82c417bf6a3eb Mon Sep 17 00:00:00 2001
From 73be070d77dd79f210bf045c6ec01bf2ecf72f18 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@ -6,7 +6,7 @@ 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/Location.java b/src/main/java/org/bukkit/Location.java
index 162a76e8b..056a4d6bb 100644
index 162a76e8..056a4d6b 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -745,6 +745,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
@ -98,10 +98,10 @@ index 162a76e8b..056a4d6bb 100644
@Override
public boolean equals(Object obj) {
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d20b940ac..673f1a3eb 100644
index 1f63eba8..e83b2ac7 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -899,6 +899,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1115,6 +1115,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(Location loc, float power, boolean setFire);
@ -205,5 +205,5 @@ index d20b940ac..673f1a3eb 100644
* Gets the {@link Environment} type of this world
*
--
2.19.0
2.19.1