Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-16 07:35:32 +01:00
Code Issues Projects Releases Wiki Activity

Controllable should allow donkeys/mules to use horse physics, and delay skin respawning by a tick

Browse Source
This commit is contained in:
fullwall 2020-05-04 16:09:07 +08:00
parent 9a4c8e73c2
commit a9ddebd8f8
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -77,7 +77,6 @@ import net.citizensnpcs.api.trait.trait.Speech;
import net.citizensnpcs.api.util.Colorizer; import net.citizensnpcs.api.util.Colorizer;
import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.api.util.Paginator; import net.citizensnpcs.api.util.Paginator;
import net.citizensnpcs.api.util.Placeholders;
import net.citizensnpcs.npc.EntityControllers; import net.citizensnpcs.npc.EntityControllers;
import net.citizensnpcs.npc.NPCSelector; import net.citizensnpcs.npc.NPCSelector;
import net.citizensnpcs.npc.Template; import net.citizensnpcs.npc.Template;
@ -409,7 +408,7 @@ public class NPCCommands {
permission = "citizens.npc.create") permission = "citizens.npc.create")
@Requirements @Requirements
public void create(CommandContext args, CommandSender sender, NPC npc) throws CommandException { public void create(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
String name = Placeholders.replace(Colorizer.parseColors(args.getJoinedStrings(1).trim()), sender, null); String name = Colorizer.parseColors(args.getJoinedStrings(1).trim());
EntityType type = EntityType.PLAYER; EntityType type = EntityType.PLAYER;
if (args.hasValueFlag("type")) { if (args.hasValueFlag("type")) {
String inputType = args.getFlag("type"); String inputType = args.getFlag("type");

13
main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
View File

@ -136,10 +136,15 @@ public class Skin {
NPC npc = entity.getNPC(); NPC npc = entity.getNPC();
if (npc.isSpawned()) { if (!npc.isSpawned())
npc.despawn(DespawnReason.PENDING_RESPAWN); return;
npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN); Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
} @Override
public void run() {
npc.despawn(DespawnReason.PENDING_RESPAWN);
npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN);
}
});
} }
private void fetch() { private void fetch() {

3
main/src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -8,7 +8,6 @@ import org.bukkit.Location;
import org.bukkit.entity.EnderDragon; import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -312,7 +311,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
boolean onGround = NMS.isOnGround(npc.getEntity()); boolean onGround = NMS.isOnGround(npc.getEntity());
float speedMod = npc.getNavigator().getDefaultParameters() float speedMod = npc.getNavigator().getDefaultParameters()
.modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED)); .modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED));
if (!(npc.getEntity() instanceof Horse)) { // just use minecraft horse physics if (!Util.isHorse(npc.getEntity().getType())) { // just use minecraft horse physics
speed = updateHorizontalSpeed(npc.getEntity(), rider, speed, speedMod); speed = updateHorizontalSpeed(npc.getEntity(), rider, speed, speedMod);
} }