Allow enderman to make provoked sound when angry (GeyserMC#1763)

bundabrg · Jan 1, 2021 · eccb488 · eccb488
1 parent 186d949
commit eccb488
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/EndermanEntity.java
@@ -27,8 +27,10 @@
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.SoundEvent;
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
 import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
+import com.nukkitx.protocol.bedrock.packet.LevelSoundEvent2Packet;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.world.block.BlockTranslator;
@@ -45,11 +47,21 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
         if (entityMetadata.getId() == 15) {
             metadata.put(EntityData.CARRIED_BLOCK, BlockTranslator.getBedrockBlockId((int) entityMetadata.getValue()));
         }
-        // 'Angry' - mouth open
+        // "Is screaming" - controls sound
         if (entityMetadata.getId() == 16) {
+            if ((boolean) entityMetadata.getValue()) {
+                LevelSoundEvent2Packet packet = new LevelSoundEvent2Packet();
+                packet.setSound(SoundEvent.STARE);
+                packet.setPosition(this.position);
+                packet.setExtraData(-1);
+                packet.setIdentifier("minecraft:enderman");
+                session.sendUpstreamPacket(packet);
+            }
+        }
+        // "Is staring/provoked" - controls visuals
+        if (entityMetadata.getId() == 17) {
             metadata.getFlags().setFlag(EntityFlag.ANGRY, (boolean) entityMetadata.getValue());
         }
-        // TODO: ID 17 is stared at but I don't believe it's used - maybe only for the sound effect. Check after particle merge
         super.updateBedrockMetadata(entityMetadata, session);
     }
 }