Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-06 03:17:27 +02:00
Code Issues Projects Releases Wiki Activity

Fix stackoverflow error with horses/pigs, fix player movement

Browse Source
This commit is contained in:
fullwall 2016-05-11 21:53:12 +08:00
parent 9af9a2fba1
commit f9edd70041
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/npc/entity/HorseController.java
View File

@ -154,11 +154,8 @@ public class HorseController extends MobEntityController {
@Override
public void g(float f, float f1) {
if (npc == null) {
if (npc == null || !npc.isFlyable()) {
super.g(f, f1);
return;
} else if (!npc.isFlyable()) {
g(f, f1);
} else {
NMS.flyingMoveLogic(this, f, f1);
}

4
src/main/java/net/citizensnpcs/npc/entity/PigController.java
View File

@ -138,10 +138,8 @@ public class PigController extends MobEntityController {
@Override
public void g(float f, float f1) {
if (npc == null) {
if (npc == null || !npc.isFlyable()) {
super.g(f, f1);
} else if (!npc.isFlyable()) {
g(f, f1);
} else {
NMS.flyingMoveLogic(this, f, f1);
}

2
src/main/java/net/citizensnpcs/util/nms/PlayerControllerMove.java
View File

@ -90,7 +90,7 @@ public class PlayerControllerMove extends ControllerMove {
AttributeInstance speed = this.a.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
speed.setValue(0.1D * this.e);
float movement = (float) (this.e * speed.getValue()) * 10;
this.a.be = movement;
this.a.bf = movement;
if (shouldSlimeJump() || ((d2 > 0.0D) && (d0 * d0 + d1 * d1 < 1.0D))) {
this.h = cg();
this.h /= 3;