13
0
geforkt von Mirrors/Paper

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

Dieser Commit ist enthalten in:
Jake Potrebic 2023-07-06 20:38:46 -07:00
Ursprung 40e354e38e
Commit a7bb0d20d4
2 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

@ -21,6 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return centerLoc; return centerLoc;
} }
+ // Paper start - Expand Explosions API
+ /** + /**
+ * Creates explosion at this location with given power + * 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 + * @param breakBlocks Whether or not to have blocks be destroyed
+ * @return false if explosion was canceled, otherwise true + * @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); + 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. * Returns a list of entities within a bounding box centered around a Location.