OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

[ci skip] Use Nullable annotation for Entity source (#9435)

Browse source
This commit is contained in:
Jake Potrebic 2023-07-06 20:38:46 -07:00
parent 40e354e38e
commit a7bb0d20d4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
patches/api/Add-Heightmap-API.patch
View file

@ -59,7 +59,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
+ // Paper start - Add heightmap api
+
+ /**
+ * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
+ * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
@ -97,11 +96,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ ret.setY(this.getWorld().getHighestBlockYAt(this, heightMap));
+ return ret;
+ }
+ // Paper end
+ // Paper end - Add heightmap api
+
// Paper start - Expand Explosions API
/**
* Creates explosion at this location with given power
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/World.java

4
patches/api/Expand-Explosions-API.patch
View file

@ -21,6 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return centerLoc;
}
+ // Paper start - Expand Explosions API
+ /**
+ * Creates explosion at this location with given power
+ *
@ -98,9 +99,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @param breakBlocks Whether or not to have blocks be destroyed
+ * @return false if explosion was canceled, otherwise true
+ */
+ public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
+ public boolean createExplosion(@Nullable Entity source, float power, boolean setFire, boolean breakBlocks) {
+ return this.getWorld().createExplosion(source, this, power, setFire, breakBlocks);
+ }
+ // Paper end - Expand Explosions API
+
/**
* Returns a list of entities within a bounding box centered around a Location.