13
0
geforkt von Mirrors/Paper

Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
218294b1 PR-743: Support setting individual Wither head targets

CraftBukkit Changes:
d48f2d1a PR-1047: Support setting individual Wither head targets
518f1bee SPIGOT-6948: Motion from Explosion after Respawn
f3c7a6ac SPIGOT-7019: Add yaw in World#getSpawnLocation
Dieser Commit ist enthalten in:
Nassim Jahnke 2022-05-17 11:51:46 +02:00
Ursprung c161caeb17
Commit cbe35089c6
7 geänderte Dateien mit 16 neuen und 30 gelöschten Zeilen

Datei anzeigen

@ -638,10 +638,11 @@ diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/buk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Wither.java --- a/src/main/java/org/bukkit/entity/Wither.java
+++ b/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java
@@ -0,0 +0,0 @@ import com.destroystokyo.paper.entity.RangedEntity; @@ -0,0 +0,0 @@ public interface Wither extends Monster, Boss, com.destroystokyo.paper.entity.Ra
* Represents a Wither boss LEFT,
*/ RIGHT
public interface Wither extends Monster, Boss, RangedEntity { // Paper }
+
+ // Paper start + // Paper start
+ /** + /**
+ * @return whether the wither is charged + * @return whether the wither is charged

Datei anzeigen

@ -170,14 +170,12 @@ diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/buk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Wither.java --- a/src/main/java/org/bukkit/entity/Wither.java
+++ b/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
package org.bukkit.entity;
+import com.destroystokyo.paper.entity.RangedEntity;
+
/** /**
* Represents a Wither boss * Represents a Wither boss
*/ */
-public interface Wither extends Monster, Boss { -public interface Wither extends Monster, Boss {
+public interface Wither extends Monster, Boss, RangedEntity { // Paper +public interface Wither extends Monster, Boss, com.destroystokyo.paper.entity.RangedEntity { // Paper
}
/**
* {@inheritDoc}

Datei anzeigen

@ -17,16 +17,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
Player respawnPlayer = entityplayer1.getBukkitEntity(); Player respawnPlayer = entityplayer1.getBukkitEntity();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Location getSpawnLocation() {
BlockPos spawn = this.world.getSharedSpawnPos();
- return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ());
+ return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ(), world.levelData.getSpawnAngle(), 0.0F); // Paper - expose world spawn angle
}
@Override

Datei anzeigen

@ -568,8 +568,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
@@ -0,0 +0,0 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok @@ -0,0 +0,0 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
public BossBar getBossBar() { Entity target = this.getHandle().getLevel().getEntity(entityId);
return this.bossBar; return (target != null) ? (LivingEntity) target.getBukkitEntity() : null;
} }
+ +
+ // Paper start + // Paper start

Datei anzeigen

@ -151,8 +151,8 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.boss.CraftBossBar; @@ -0,0 +0,0 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Wither; import org.bukkit.entity.Wither;
-public class CraftWither extends CraftMonster implements Wither { -public class CraftWither extends CraftMonster implements Wither {

@ -1 +1 @@
Subproject commit 312281eade984b060ae27c84b63f48cafbb76fd8 Subproject commit 218294b1485bdcac543ac2e309307b36ad82461e

@ -1 +1 @@
Subproject commit 2ac7fa7af6c1e1ddb0a61d7761eb66eda96f8207 Subproject commit d48f2d1a508937908a7fb9169d29f53f1b34ab76