Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-22 09:07:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix players waiting for 60 ticks client timeout delay before becoming interactable in 1.21.4

Browse Source
This commit is contained in:
fullwall 2024-12-10 19:01:36 +08:00
parent d8cc7b6f94
commit b2cedaf36c
13 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
View File

@ -240,7 +240,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
}
@Override

1
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
View File

@ -269,7 +269,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
}
@Override

1
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
View File

@ -277,7 +277,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
View File

@ -267,7 +267,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
View File

@ -269,7 +269,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
View File

@ -269,7 +269,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java
View File

@ -241,7 +241,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
conn.setPacketListener(playerConnection);
} catch (IOException e) {
}
invulnerableTicks = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
View File

@ -261,7 +261,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
} catch (IOException e) {
// swallow
}
this.invulnerableTime = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java
View File

@ -261,7 +261,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
conn.setListener(connection);
} catch (IOException e) {
}
this.invulnerableTime = 0;
setSkinFlags((byte) 0xFF);
}

1
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EntityHumanNPC.java
View File

@ -266,7 +266,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
conn.setListener(connection);
} catch (IOException e) {
}
this.invulnerableTime = 0;
setSkinFlags((byte) 0xFF);
}

3
v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/EntityHumanNPC.java
View File

@ -60,13 +60,11 @@ import net.minecraft.world.phys.Vec3;
public class EntityHumanNPC extends ServerPlayer implements NPCHolder, SkinnableEntity, ForwardingMobAI {
private PlayerAdvancements advancements;
private MobAI ai;
private int jumpTicks = 0;
private final CitizensNPC npc;
private boolean setBukkitEntity;
private final SkinPacketTracker skinTracker;
private EmptyServerStatsCounter statsCache;
public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GameProfile gameProfile,
@ -269,7 +267,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
} catch (IOException e) {
e.printStackTrace();
}
this.invulnerableTime = 0;
setSkinFlags((byte) 0xFF);
}

2
v1_21_R3/src/main/java/net/citizensnpcs/nms/v1_21_R3/entity/EntityHumanNPC.java
View File

@ -268,7 +268,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
} catch (IOException e) {
e.printStackTrace();
}
this.invulnerableTime = 0;
setClientLoaded(true);
setSkinFlags((byte) 0xFF);
}

1
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
View File

@ -241,7 +241,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
controllerJump = new PlayerControllerJump(this);
controllerMove = new PlayerControllerMove(this);
navigation = new PlayerNavigation(this, world);
invulnerableTicks = 0;
}
public boolean isNavigating() {