Skip to content
This repository was archived by the owner on Apr 7, 2021. It is now read-only.

Commit aa89bdc

Browse files
committed
Fix waterlogged again (the mappings were overwritten, lol)
1 parent b31a67d commit aa89bdc

File tree

2 files changed

+58
-29
lines changed

2 files changed

+58
-29
lines changed

proxy/src/main/java/org/dragonet/proxy/network/translator/bedrock/player/PEMovePlayerTranslator.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ public void translate(ProxySession session, MovePlayerPacket packet) {
6262
y = Math.ceil(y * 2) / 2; // If we only do this when on ground then movement isn't so buggy
6363
}
6464

65-
ClientPlayerPositionRotationPacket playerPositionRotationPacket = new ClientPlayerPositionRotationPacket(packet.isOnGround(), GenericMath.round(packet.getPosition().getX(), 4),
66-
y, GenericMath.round(packet.getPosition().getZ(), 4), packet.getRotation().getY(), packet.getRotation().getX());
65+
// I must admit some credit to Geyser for finding the precision loss issue
66+
// I Googled how to not lose precision when casting a float to a double and apparently this is a good way to do it
67+
ClientPlayerPositionRotationPacket playerPositionRotationPacket = new ClientPlayerPositionRotationPacket(packet.isOnGround(), Double.parseDouble(Float.toString(packet.getPosition().getX())),
68+
y, Double.parseDouble(Float.toString(packet.getPosition().getZ())), packet.getRotation().getY(), packet.getRotation().getX());
6769

6870
session.sendRemotePacket(playerPositionRotationPacket);
6971
}

proxy/src/main/resources/mappings/1.15/block_mappings.json

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8825,21 +8825,24 @@
88258825
"hardness": 0.0,
88268826
"bedrock_states": {
88278827
"sea_grass_type": "default"
8828-
}
8828+
},
8829+
"waterlogged": true
88298830
},
88308831
"minecraft:tall_seagrass[half=upper]": {
88318832
"bedrock_identifier": "minecraft:seagrass",
88328833
"hardness": 0.0,
88338834
"bedrock_states": {
88348835
"sea_grass_type": "double_top"
8835-
}
8836+
},
8837+
"waterlogged": true
88368838
},
88378839
"minecraft:tall_seagrass[half=lower]": {
88388840
"bedrock_identifier": "minecraft:seagrass",
88398841
"hardness": 0.0,
88408842
"bedrock_states": {
88418843
"sea_grass_type": "double_bot"
8842-
}
8844+
},
8845+
"waterlogged": true
88438846
},
88448847
"minecraft:piston[extended=true,facing=north]": {
88458848
"bedrock_identifier": "minecraft:piston",
@@ -74235,28 +74238,32 @@
7423574238
"hardness": 0.0,
7423674239
"bedrock_states": {
7423774240
"kelp_age": 0
74238-
}
74241+
},
74242+
"waterlogged": true
7423974243
},
7424074244
"minecraft:kelp[age=1]": {
7424174245
"bedrock_identifier": "minecraft:kelp",
7424274246
"hardness": 0.0,
7424374247
"bedrock_states": {
7424474248
"kelp_age": 1
74245-
}
74249+
},
74250+
"waterlogged": true
7424674251
},
7424774252
"minecraft:kelp[age=2]": {
7424874253
"bedrock_identifier": "minecraft:kelp",
7424974254
"hardness": 0.0,
7425074255
"bedrock_states": {
7425174256
"kelp_age": 2
74252-
}
74257+
},
74258+
"waterlogged": true
7425374259
},
7425474260
"minecraft:kelp[age=3]": {
7425574261
"bedrock_identifier": "minecraft:kelp",
7425674262
"hardness": 0.0,
7425774263
"bedrock_states": {
7425874264
"kelp_age": 3
74259-
}
74265+
},
74266+
"waterlogged": true
7426074267
},
7426174268
"minecraft:kelp[age=4]": {
7426274269
"bedrock_identifier": "minecraft:kelp",
@@ -74277,49 +74284,56 @@
7427774284
"hardness": 0.0,
7427874285
"bedrock_states": {
7427974286
"kelp_age": 6
74280-
}
74287+
},
74288+
"waterlogged": true
7428174289
},
7428274290
"minecraft:kelp[age=7]": {
7428374291
"bedrock_identifier": "minecraft:kelp",
7428474292
"hardness": 0.0,
7428574293
"bedrock_states": {
7428674294
"kelp_age": 7
74287-
}
74295+
},
74296+
"waterlogged": true
7428874297
},
7428974298
"minecraft:kelp[age=8]": {
7429074299
"bedrock_identifier": "minecraft:kelp",
7429174300
"hardness": 0.0,
7429274301
"bedrock_states": {
7429374302
"kelp_age": 8
74294-
}
74303+
},
74304+
"waterlogged": true
7429574305
},
7429674306
"minecraft:kelp[age=9]": {
7429774307
"bedrock_identifier": "minecraft:kelp",
7429874308
"hardness": 0.0,
7429974309
"bedrock_states": {
7430074310
"kelp_age": 9
74301-
}
74311+
},
74312+
"waterlogged": true
7430274313
},
7430374314
"minecraft:kelp[age=10]": {
7430474315
"bedrock_identifier": "minecraft:kelp",
7430574316
"hardness": 0.0,
7430674317
"bedrock_states": {
7430774318
"kelp_age": 10
74308-
}
74319+
},
74320+
"waterlogged": true
7430974321
},
7431074322
"minecraft:kelp[age=11]": {
7431174323
"bedrock_identifier": "minecraft:kelp",
7431274324
"hardness": 0.0,
7431374325
"bedrock_states": {
7431474326
"kelp_age": 11
74315-
}
74327+
},
74328+
"waterlogged": true
7431674329
},
7431774330
"minecraft:kelp[age=12]": {
7431874331
"bedrock_identifier": "minecraft:kelp",
7431974332
"hardness": 0.0,
7432074333
"bedrock_states": {
7432174334
"kelp_age": 12
74322-
}
74335+
},
74336+
"waterlogged": true
7432374337
},
7432474338
"minecraft:kelp[age=13]": {
7432574339
"bedrock_identifier": "minecraft:kelp",
@@ -74340,70 +74354,80 @@
7434074354
"hardness": 0.0,
7434174355
"bedrock_states": {
7434274356
"kelp_age": 15
74343-
}
74357+
},
74358+
"waterlogged": true
7434474359
},
7434574360
"minecraft:kelp[age=16]": {
7434674361
"bedrock_identifier": "minecraft:kelp",
7434774362
"hardness": 0.0,
7434874363
"bedrock_states": {
7434974364
"kelp_age": 16
74350-
}
74365+
},
74366+
"waterlogged": true
7435174367
},
7435274368
"minecraft:kelp[age=17]": {
7435374369
"bedrock_identifier": "minecraft:kelp",
7435474370
"hardness": 0.0,
7435574371
"bedrock_states": {
7435674372
"kelp_age": 17
74357-
}
74373+
},
74374+
"waterlogged": true
7435874375
},
7435974376
"minecraft:kelp[age=18]": {
7436074377
"bedrock_identifier": "minecraft:kelp",
7436174378
"hardness": 0.0,
7436274379
"bedrock_states": {
7436374380
"kelp_age": 18
74364-
}
74381+
},
74382+
"waterlogged": true
7436574383
},
7436674384
"minecraft:kelp[age=19]": {
7436774385
"bedrock_identifier": "minecraft:kelp",
7436874386
"hardness": 0.0,
7436974387
"bedrock_states": {
7437074388
"kelp_age": 19
74371-
}
74389+
},
74390+
"waterlogged": true
7437274391
},
7437374392
"minecraft:kelp[age=20]": {
7437474393
"bedrock_identifier": "minecraft:kelp",
7437574394
"hardness": 0.0,
7437674395
"bedrock_states": {
7437774396
"kelp_age": 20
74378-
}
74397+
},
74398+
"waterlogged": true
7437974399
},
7438074400
"minecraft:kelp[age=21]": {
7438174401
"bedrock_identifier": "minecraft:kelp",
7438274402
"hardness": 0.0,
7438374403
"bedrock_states": {
7438474404
"kelp_age": 21
74385-
}
74405+
},
74406+
"waterlogged": true
7438674407
},
7438774408
"minecraft:kelp[age=22]": {
7438874409
"bedrock_identifier": "minecraft:kelp",
7438974410
"hardness": 0.0,
7439074411
"bedrock_states": {
7439174412
"kelp_age": 22
74392-
}
74413+
},
74414+
"waterlogged": true
7439374415
},
7439474416
"minecraft:kelp[age=23]": {
7439574417
"bedrock_identifier": "minecraft:kelp",
7439674418
"hardness": 0.0,
7439774419
"bedrock_states": {
7439874420
"kelp_age": 23
74399-
}
74421+
},
74422+
"waterlogged": true
7440074423
},
7440174424
"minecraft:kelp[age=24]": {
7440274425
"bedrock_identifier": "minecraft:kelp",
7440374426
"hardness": 0.0,
7440474427
"bedrock_states": {
7440574428
"kelp_age": 24
74406-
}
74429+
},
74430+
"waterlogged": true
7440774431
},
7440874432
"minecraft:kelp[age=25]": {
7440974433
"bedrock_identifier": "minecraft:kelp",
@@ -74417,7 +74441,8 @@
7441774441
"hardness": 0.0,
7441874442
"bedrock_states": {
7441974443
"kelp_age": 0
74420-
}
74444+
},
74445+
"waterlogged": true
7442174446
},
7442274447
"minecraft:dried_kelp_block": {
7442374448
"bedrock_identifier": "minecraft:dried_kelp_block",
@@ -76064,14 +76089,16 @@
7606476089
"hardness": 0.0,
7606576090
"bedrock_states": {
7606676091
"drag_down": true
76067-
}
76092+
},
76093+
"waterlogged": true
7606876094
},
7606976095
"minecraft:bubble_column[drag=false]": {
7607076096
"bedrock_identifier": "minecraft:bubble_column",
7607176097
"hardness": 0.0,
7607276098
"bedrock_states": {
7607376099
"drag_down": false
76074-
}
76100+
},
76101+
"waterlogged": true
7607576102
},
7607676103
"minecraft:polished_granite_stairs[facing=north,half=top,shape=straight,waterlogged=true]": {
7607776104
"bedrock_identifier": "minecraft:polished_granite_stairs",

0 commit comments

Comments
 (0)