Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-07 11:09:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1260 from KennyTV/dev

Browse Source 
Fix tridents (and building)
This commit is contained in:
Myles 2019-04-21 17:53:43 +01:00 committed by GitHub
commit 49e85e2b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_13Types.java
View File

@ -270,7 +270,8 @@ public class Entity1_13Types {
EVOCATION_FANGS(79, EntityType.EVOCATION_FANGS), EVOCATION_FANGS(79, EntityType.EVOCATION_FANGS),
FISHIHNG_HOOK(90, EntityType.FISHING_BOBBER), FISHIHNG_HOOK(90, EntityType.FISHING_BOBBER),
SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW), SPECTRAL_ARROW(91, EntityType.SPECTRAL_ARROW),
DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL); DRAGON_FIREBALL(93, EntityType.DRAGON_FIREBALL),
TRIDENT(94, EntityType.TRIDENT);
private final int id; private final int id;
private final EntityType type; private final EntityType type;

8
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
View File

@ -83,12 +83,8 @@ public class EntityPackets {
break; break;
} }
} else if ((type1_14.is(Entity1_14Types.EntityType.ITEM) && data > 0) } else if ((type1_14.is(Entity1_14Types.EntityType.ITEM) && data > 0)
|| type1_14.is(Entity1_14Types.EntityType.ARROW) || type1_14.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ARROW)) {
|| type1_14.is(Entity1_14Types.EntityType.SPECTRAL_ARROW) if (type1_14.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ARROW)) {
|| type1_14.is(Entity1_14Types.EntityType.TRIDENT)) {
if (type1_14.is(Entity1_14Types.EntityType.ARROW)
|| type1_14.is(Entity1_14Types.EntityType.SPECTRAL_ARROW)
|| type1_14.is(Entity1_14Types.EntityType.TRIDENT))) { // todo check if trident needs it
wrapper.set(Type.INT, 0, data - 1); wrapper.set(Type.INT, 0, data - 1);
} }
// send velocity in separate packet, 1.14 is now ignoring the velocity // send velocity in separate packet, 1.14 is now ignoring the velocity