Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-11-14 19:34:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature/1.20.2

Browse source
This commit is contained in:
Konicai 2023-09-08 19:04:27 -04:00
commit fa846a7726
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventType.java
View file

@ -10,10 +10,6 @@ public enum LevelEventType implements LevelEvent {
BLOCK_DISPENSER_LAUNCH(1002), BLOCK_DISPENSER_LAUNCH(1002),
ENTITY_ENDEREYE_LAUNCH(1003), ENTITY_ENDEREYE_LAUNCH(1003),
ENTITY_FIREWORK_SHOOT(1004), ENTITY_FIREWORK_SHOOT(1004),
BLOCK_IRON_DOOR_OPEN(1005),
BLOCK_WOODEN_DOOR_OPEN(1006),
BLOCK_WOODEN_TRAPDOOR_OPEN(1007),
BLOCK_FENCE_GATE_OPEN(1008),
BLOCK_FIRE_EXTINGUISH(1009), BLOCK_FIRE_EXTINGUISH(1009),
RECORD(1010), RECORD(1010),
STOP_RECORD(1011), // As of 1.19.4 STOP_RECORD(1011), // As of 1.19.4
@ -38,8 +34,6 @@ public enum LevelEventType implements LevelEvent {
BLOCK_CHORUS_FLOWER_GROW(1033), BLOCK_CHORUS_FLOWER_GROW(1033),
BLOCK_CHORUS_FLOWER_DEATH(1034), BLOCK_CHORUS_FLOWER_DEATH(1034),
BLOCK_BREWING_STAND_BREW(1035), BLOCK_BREWING_STAND_BREW(1035),
BLOCK_IRON_TRAPDOOR_CLOSE(1036),
BLOCK_IRON_TRAPDOOR_OPEN(1037),
BLOCK_END_PORTAL_SPAWN(1038), // Global level event BLOCK_END_PORTAL_SPAWN(1038), // Global level event
ENTITY_PHANTOM_BITE(1039), ENTITY_PHANTOM_BITE(1039),
ENTITY_ZOMBIE_CONVERTED_TO_DROWNED(1040), ENTITY_ZOMBIE_CONVERTED_TO_DROWNED(1040),
@ -77,7 +71,9 @@ public enum LevelEventType implements LevelEvent {
WAX_OFF(3004), WAX_OFF(3004),
SCRAPE(3005), SCRAPE(3005),
SCULK_BLOCK_CHARGE(3006), SCULK_BLOCK_CHARGE(3006),
SCULK_SHRIEKER_SHRIEK(3007); SCULK_SHRIEKER_SHRIEK(3007),
BRUSH_BLOCK_COMPLETE(3008),
EGG_CRACK(3009);
private final int id; private final int id;

1
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
View file

@ -43,6 +43,7 @@ public class ClientboundLevelEventPacket implements MinecraftPacket {
this.data = new SmokeEventData(Direction.from(Math.abs(value % 6))); this.data = new SmokeEventData(Direction.from(Math.abs(value % 6)));
break; break;
case BREAK_BLOCK: case BREAK_BLOCK:
case BRUSH_BLOCK_COMPLETE:
this.data = new BreakBlockEventData(value); this.data = new BreakBlockEventData(value);
break; break;
case BREAK_SPLASH_POTION: case BREAK_SPLASH_POTION: