mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 12:42:05 -07:00
[1.16] Make it run (#3626)
* She compiles! Also readded the armorstand ticking patch, thanks cat * Update mob goal api * Misc fixes to make it run drop per playing mob spawns for now
This commit is contained in:
@@ -315,7 +315,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ GoalKey<Phantom> PHANTOM_ATTACK_STRATEGY = GoalKey.of(Phantom.class, NamespacedKey.minecraft("phantom_attack_strategy"));
|
||||
+ GoalKey<Phantom> PHANTOM_CIRCLE_AROUND_ANCHOR = GoalKey.of(Phantom.class, NamespacedKey.minecraft("phantom_circle_around_anchor"));
|
||||
+ GoalKey<Phantom> PHANTOM_SWEEP_ATTACK = GoalKey.of(Phantom.class, NamespacedKey.minecraft("phantom_sweep_attack"));
|
||||
+ /**
|
||||
+ * @deprecated removed in 1.16
|
||||
+ */
|
||||
+ @Deprecated
|
||||
+ GoalKey<PigZombie> ANGER = GoalKey.of(PigZombie.class, NamespacedKey.minecraft("anger"));
|
||||
+ /**
|
||||
+ * @deprecated removed in 1.16
|
||||
+ */
|
||||
+ @Deprecated
|
||||
+ GoalKey<PigZombie> ANGER_OTHER = GoalKey.of(PigZombie.class, NamespacedKey.minecraft("anger_other"));
|
||||
+ GoalKey<PolarBear> POLARBEAR_ATTACK_PLAYERS = GoalKey.of(PolarBear.class, NamespacedKey.minecraft("polarbear_attack_players"));
|
||||
+ GoalKey<PolarBear> POLARBEAR_HURT_BY = GoalKey.of(PolarBear.class, NamespacedKey.minecraft("polarbear_hurt_by"));
|
||||
@@ -424,6 +432,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ GoalKey<Creature> WATER = GoalKey.of(Creature.class, NamespacedKey.minecraft("water"));
|
||||
+ GoalKey<Dolphin> WATER_JUMP = GoalKey.of(Dolphin.class, NamespacedKey.minecraft("water_jump"));
|
||||
+ GoalKey<Zombie> ZOMBIE_ATTACK = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack"));
|
||||
+ GoalKey<Creature> STROLL_VILLAGE_GOLEM = GoalKey.of(Creature.class, NamespacedKey.minecraft("stroll_village_golem"));
|
||||
+ GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
|
@@ -15,14 +15,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
*/
|
||||
public int getSleepTicks();
|
||||
|
||||
+ /**
|
||||
+ * Gets the Location where the player will spawn at their bed, null if
|
||||
+ * they have not slept in one or their current bed spawn is invalid.
|
||||
+ *
|
||||
+ * @return Bed Spawn Location if bed exists, otherwise null.
|
||||
+ */
|
||||
+ @Nullable
|
||||
+ public Location getBedSpawnLocation();
|
||||
+
|
||||
+ // Paper start - Potential bed api
|
||||
+ /**
|
||||
@@ -35,22 +27,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ @Nullable
|
||||
+ public Location getPotentialBedLocation();
|
||||
+ // Paper end
|
||||
+
|
||||
+ /**
|
||||
+ * Sets the Location where the player will spawn at their bed.
|
||||
+ *
|
||||
+ * @param location where to set the respawn location
|
||||
+ */
|
||||
+ public void setBedSpawnLocation(@Nullable Location location);
|
||||
+
|
||||
+ /**
|
||||
+ * Sets the Location where the player will spawn at their bed.
|
||||
+ *
|
||||
+ * @param location where to set the respawn location
|
||||
+ * @param force whether to forcefully set the respawn location even if a
|
||||
+ * valid bed is not present
|
||||
+ */
|
||||
+ public void setBedSpawnLocation(@Nullable Location location, boolean force);
|
||||
+
|
||||
/**
|
||||
* Attempts to make the entity sleep at the given location.
|
||||
|
Reference in New Issue
Block a user