Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce base horse movement speed

This commit is contained in:
fullwall 2020-02-16 17:18:12 +08:00
parent b9a08d609a
commit 2d2b796b12
15 changed files with 42 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MobEntityController.java
View File

@ -1,4 +1,6 @@
package net.citizensnpcs.nms.v1_12_R1.entity; import net.minecraft.server.v1_12_R1.DamageSource;
package net.citizensnpcs.nms.v1_12_R1.entity;
import net.minecraft.server.v1_12_R1.DamageSource;
import java.lang.reflect.Constructor;
import java.util.Map;

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java
View File

@ -1,4 +1,6 @@
package net.citizensnpcs.nms.v1_12_R1.entity; import net.minecraft.server.v1_12_R1.DamageSource;
package net.citizensnpcs.nms.v1_12_R1.entity;
import net.minecraft.server.v1_12_R1.DamageSource;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
View File

@ -14,8 +14,8 @@ import net.minecraft.server.v1_12_R1.MinecraftServer;
public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
super(minecraftserver, file, entityplayer);
this.b();
}
this.b();
}
@Override
public void a(Advancement advancement) {

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
View File

@ -197,12 +197,10 @@ public class ChickenController extends MobEntityController {
}
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
View File

@ -178,12 +178,10 @@ public class EnderDragonController extends MobEntityController {
} else {
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
View File

@ -179,12 +179,10 @@ public class GuardianController extends MobEntityController {
if (npc == null) {
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
View File

@ -179,12 +179,10 @@ public class GuardianElderController extends MobEntityController {
if (npc == null) {
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
View File

@ -178,12 +178,10 @@ public class PhantomController extends MobEntityController {
public void movementTick() {
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
View File

@ -168,12 +168,10 @@ public class ShulkerController extends MobEntityController {
if (npc == null) {
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

4
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
View File

@ -1,4 +1,6 @@
package net.citizensnpcs.nms.v1_13_R2.entity; import net.minecraft.server.v1_13_R2.DamageSource;
package net.citizensnpcs.nms.v1_13_R2.entity;
import net.minecraft.server.v1_13_R2.DamageSource;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;

6
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
View File

@ -177,12 +177,10 @@ public class SnowmanController extends MobEntityController {
}
try {
super.movementTick();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
MOVEMENT_TICK.invoke(this);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

4
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
View File

@ -14,8 +14,8 @@ import net.minecraft.server.v1_13_R2.MinecraftServer;
public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
super(minecraftserver, file, entityplayer);
this.b();
}
this.b();
}
@Override
public void a(Advancement advancement) {

18
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
View File

@ -166,12 +166,10 @@ public class PlayerNavigation extends NavigationAbstract {
private static long getMonotonicMillis() {
try {
return SystemUtils.getMonotonicMillis();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
return (long) GET_MONOTONIC_MILLIS.invoke(null);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
return 0;
}
@ -465,12 +463,10 @@ public class PlayerNavigation extends NavigationAbstract {
float f1 = j();
try {
this.b.methodProfiler.enter("pathfind");
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
PROFILER_ENTER.invoke(this.b.methodProfiler, "pathfind");
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}
@ -482,12 +478,10 @@ public class PlayerNavigation extends NavigationAbstract {
PathEntity localPathEntity = this.r.a(localChunkCache, this.a, this.q, f1);
try {
this.b.methodProfiler.exit();
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
PROFILER_EXIT.invoke(this.b.methodProfiler);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
}
}

18
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
View File

@ -185,7 +185,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
return var11;
}
private static final Method BLOCK_POSITION_B_C = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "f", false, int.class, int.class, int.class);
private static final Method BLOCK_POSITION_B_C = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "f", false,
int.class, int.class, int.class);
public PathType a(IBlockAccess var1, int var2, int var3, int var4, PathType var5) {
if (var5 == PathType.WALKABLE) {
@ -199,12 +200,11 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
BlockPosition blockPos;
try {
blockPos = var6.c(var8 + var2, var3, var9 + var4);
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
blockPos = (BlockPosition.PooledBlockPosition) BLOCK_POSITION_B_C.invoke(var6, var8 + var2, var3, var9 + var4);
}
catch (Throwable ex2) {
blockPos = (BlockPosition.PooledBlockPosition) BLOCK_POSITION_B_C.invoke(var6,
var8 + var2, var3, var9 + var4);
} catch (Throwable ex2) {
ex2.printStackTrace();
return PathType.BLOCKED;
}
@ -479,12 +479,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
Fluid var9;
try {
var9 = var1.getFluid(var5);
}
catch (NoSuchMethodError ex) {
} catch (NoSuchMethodError ex) {
try {
var9 = (Fluid) GET_FLUID.invoke(var1, var5);
}
catch (Throwable ex2) {
} catch (Throwable ex2) {
ex2.printStackTrace();
return PathType.BLOCKED;
}

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java
View File

@ -62,7 +62,7 @@ public class HorseController extends MobEntityController {
NMSImpl.clearGoals(goalSelector, targetSelector);
Horse horse = (Horse) getBukkitEntity();
horse.setDomestication(horse.getMaxDomestication());
baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue() * 0.8;
}
}