Skip to content

Commit 36239ed

Browse files
Justsnoopy30Justsnoopy30
committed
Fix Minecraft 1.16 Support Syntax Error
1 parent 922aed1 commit 36239ed

File tree

1 file changed

+76
-39
lines changed

1 file changed

+76
-39
lines changed

‎Waterfall-Proxy-Patches/0003-Minecraft-1.16-Support.patch‎

Lines changed: 76 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a609eb4a966fa6c94f91fdfa615d916539acc8c4 Mon Sep 17 00:00:00 2001
1+
From 765d4cf5bf824372b422b360df378f1874bbd7de Mon Sep 17 00:00:00 2001
22
From: Justsnoopy30 <everettallen30@gmail.com>
33
Date: Sun, 16 Feb 2020 16:45:16 -0600
44
Subject: [PATCH] Minecraft 1.16 Support
@@ -338,162 +338,199 @@ index 0c51b315..53f48f3f 100644
338338

339339
<name>HyperFall-Protocol</name>
340340
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
341-
index 44dc34ff..f35e2d50 100644
341+
index 44dc34ff..177a0553 100644
342342
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
343343
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
344-
@@ -71,6 +71,7 @@ public enum Protocol
344+
@@ -70,7 +70,8 @@ public enum Protocol
345+
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
345346
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
346347
map( ProtocolConstants.MINECRAFT_1_14, 0x20 ),
347-
map( ProtocolConstants.MINECRAFT_1_15, 0x21 )
348+
- map( ProtocolConstants.MINECRAFT_1_15, 0x21 )
349+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x21 ),
348350
+ map( ProtocolConstants.MINECRAFT_1_16, 0x21 )
349351
);
350352
TO_CLIENT.registerPacket(
351353
Login.class,
352-
@@ -79,6 +80,7 @@ public enum Protocol
354+
@@ -78,7 +79,8 @@ public enum Protocol
355+
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
353356
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
354357
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
355-
map( ProtocolConstants.MINECRAFT_1_15, 0x26 )
358+
- map( ProtocolConstants.MINECRAFT_1_15, 0x26 )
359+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x26 ),
356360
+ map( ProtocolConstants.MINECRAFT_1_16, 0x26 )
357361
);
358362
TO_CLIENT.registerPacket(
359363
Chat.class,
360-
@@ -87,6 +89,7 @@ public enum Protocol
364+
@@ -86,7 +88,8 @@ public enum Protocol
365+
map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
361366
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
362367
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
363-
map( ProtocolConstants.MINECRAFT_1_15, 0x0F )
368+
- map( ProtocolConstants.MINECRAFT_1_15, 0x0F )
369+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x0F ),
364370
+ map( ProtocolConstants.MINECRAFT_1_16, 0x0F )
365371
);
366372
TO_CLIENT.registerPacket(
367373
Respawn.class,
368-
@@ -98,12 +101,14 @@ public enum Protocol
374+
@@ -97,13 +100,15 @@ public enum Protocol
375+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
369376
map( ProtocolConstants.MINECRAFT_1_13, 0x38 ),
370377
map( ProtocolConstants.MINECRAFT_1_14, 0x3A ),
371-
map( ProtocolConstants.MINECRAFT_1_15, 0x3B )
378+
- map( ProtocolConstants.MINECRAFT_1_15, 0x3B )
379+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x3B ),
372380
+ map( ProtocolConstants.MINECRAFT_1_16, 0x3B )
373381
);
374382
TO_CLIENT.registerPacket(
375383
BossBar.class,
376384
BossBar::new, // Waterfall - speed up packet construction
377385
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
378-
map( ProtocolConstants.MINECRAFT_1_15, 0x0D )
386+
- map( ProtocolConstants.MINECRAFT_1_15, 0x0D )
387+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
379388
+ map( ProtocolConstants.MINECRAFT_1_16, 0x0D )
380389
);
381390
// Waterfall start
382391
TO_CLIENT.registerPacket(
383-
@@ -117,6 +122,7 @@ public enum Protocol
392+
@@ -116,7 +121,8 @@ public enum Protocol
393+
map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F),
384394
map(ProtocolConstants.MINECRAFT_1_13, 0x53),
385395
map(ProtocolConstants.MINECRAFT_1_14, 0x59),
386-
map(ProtocolConstants.MINECRAFT_1_15, 0x5A)
396+
- map(ProtocolConstants.MINECRAFT_1_15, 0x5A)
397+
+ map(ProtocolConstants.MINECRAFT_1_15, 0x5A),
387398
+ map(ProtocolConstants.MINECRAFT_1_16, 0x5A)
388399
);
389400
TO_CLIENT.registerPacket(
390401
EntityRemoveEffect.class,
391-
@@ -128,6 +134,7 @@ public enum Protocol
402+
@@ -127,7 +133,8 @@ public enum Protocol
403+
map(ProtocolConstants.MINECRAFT_1_12_1, 0x33),
392404
map(ProtocolConstants.MINECRAFT_1_13, 0x36),
393405
map(ProtocolConstants.MINECRAFT_1_14, 0x38),
394-
map(ProtocolConstants.MINECRAFT_1_15, 0x39)
406+
- map(ProtocolConstants.MINECRAFT_1_15, 0x39)
407+
+ map(ProtocolConstants.MINECRAFT_1_15, 0x39),
395408
+ map(ProtocolConstants.MINECRAFT_1_16, 0x39)
396409
);
397410
// Waterfall end
398411
TO_CLIENT.registerPacket(
399-
@@ -139,6 +146,7 @@ public enum Protocol
412+
@@ -138,7 +145,8 @@ public enum Protocol
413+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
400414
map( ProtocolConstants.MINECRAFT_1_13, 0x30 ),
401415
map( ProtocolConstants.MINECRAFT_1_14, 0x33 ),
402-
map( ProtocolConstants.MINECRAFT_1_15, 0x34 )
416+
- map( ProtocolConstants.MINECRAFT_1_15, 0x34 )
417+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x34 ),
403418
+ map( ProtocolConstants.MINECRAFT_1_16, 0x34 )
404419
);
405420
TO_CLIENT.registerPacket(
406421
TabCompleteResponse.class,
407-
@@ -147,6 +155,7 @@ public enum Protocol
422+
@@ -146,7 +154,8 @@ public enum Protocol
423+
map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
408424
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
409425
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
410-
map( ProtocolConstants.MINECRAFT_1_15, 0x11 )
426+
- map( ProtocolConstants.MINECRAFT_1_15, 0x11 )
427+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x11 ),
411428
+ map( ProtocolConstants.MINECRAFT_1_16, 0x11 )
412429
);
413430
TO_CLIENT.registerPacket(
414431
ScoreboardObjective.class,
415-
@@ -158,6 +167,7 @@ public enum Protocol
432+
@@ -157,7 +166,8 @@ public enum Protocol
433+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
416434
map( ProtocolConstants.MINECRAFT_1_13, 0x45 ),
417435
map( ProtocolConstants.MINECRAFT_1_14, 0x49 ),
418-
map( ProtocolConstants.MINECRAFT_1_15, 0x4A )
436+
- map( ProtocolConstants.MINECRAFT_1_15, 0x4A )
437+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x4A ),
419438
+ map( ProtocolConstants.MINECRAFT_1_16, 0x4A )
420439
);
421440
TO_CLIENT.registerPacket(
422441
ScoreboardScore.class,
423-
@@ -169,6 +179,7 @@ public enum Protocol
442+
@@ -168,7 +178,8 @@ public enum Protocol
443+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
424444
map( ProtocolConstants.MINECRAFT_1_13, 0x48 ),
425445
map( ProtocolConstants.MINECRAFT_1_14, 0x4C ),
426-
map( ProtocolConstants.MINECRAFT_1_15, 0x4D )
446+
- map( ProtocolConstants.MINECRAFT_1_15, 0x4D )
447+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x4D ),
427448
+ map( ProtocolConstants.MINECRAFT_1_16, 0x4D )
428449
);
429450
TO_CLIENT.registerPacket(
430451
ScoreboardDisplay.class,
431-
@@ -180,6 +191,7 @@ public enum Protocol
452+
@@ -179,7 +190,8 @@ public enum Protocol
453+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
432454
map( ProtocolConstants.MINECRAFT_1_13, 0x3E ),
433455
map( ProtocolConstants.MINECRAFT_1_14, 0x42 ),
434-
map( ProtocolConstants.MINECRAFT_1_15, 0x43 )
456+
- map( ProtocolConstants.MINECRAFT_1_15, 0x43 )
457+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x43 ),
435458
+ map( ProtocolConstants.MINECRAFT_1_16, 0x43 )
436459
);
437460
TO_CLIENT.registerPacket(
438461
Team.class,
439-
@@ -191,6 +203,7 @@ public enum Protocol
462+
@@ -190,7 +202,8 @@ public enum Protocol
463+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
440464
map( ProtocolConstants.MINECRAFT_1_13, 0x47 ),
441465
map( ProtocolConstants.MINECRAFT_1_14, 0x4B ),
442-
map( ProtocolConstants.MINECRAFT_1_15, 0x4C )
466+
- map( ProtocolConstants.MINECRAFT_1_15, 0x4C )
467+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x4C ),
443468
+ map( ProtocolConstants.MINECRAFT_1_16, 0x4C )
444469
);
445470
TO_CLIENT.registerPacket(
446471
PluginMessage.class,
447-
@@ -200,6 +213,7 @@ public enum Protocol
472+
@@ -199,7 +212,8 @@ public enum Protocol
473+
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
448474
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
449475
map( ProtocolConstants.MINECRAFT_1_14, 0x18 ),
450-
map( ProtocolConstants.MINECRAFT_1_15, 0x19 )
476+
- map( ProtocolConstants.MINECRAFT_1_15, 0x19 )
477+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x19 ),
451478
+ map( ProtocolConstants.MINECRAFT_1_16, 0x19 )
452479
);
453480
TO_CLIENT.registerPacket(
454481
Kick.class,
455-
@@ -209,6 +223,7 @@ public enum Protocol
482+
@@ -208,7 +222,8 @@ public enum Protocol
483+
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
456484
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
457485
map( ProtocolConstants.MINECRAFT_1_14, 0x1A ),
458-
map( ProtocolConstants.MINECRAFT_1_15, 0x1B )
486+
- map( ProtocolConstants.MINECRAFT_1_15, 0x1B )
487+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x1B ),
459488
+ map( ProtocolConstants.MINECRAFT_1_16, 0x1B )
460489
);
461490
TO_CLIENT.registerPacket(
462491
Title.class,
463-
@@ -219,6 +234,7 @@ public enum Protocol
492+
@@ -218,7 +233,8 @@ public enum Protocol
493+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
464494
map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
465495
map( ProtocolConstants.MINECRAFT_1_14, 0x4F ),
466-
map( ProtocolConstants.MINECRAFT_1_15, 0x50 )
496+
- map( ProtocolConstants.MINECRAFT_1_15, 0x50 )
497+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x50 ),
467498
+ map( ProtocolConstants.MINECRAFT_1_16, 0x50 )
468499
);
469500
TO_CLIENT.registerPacket(
470501
PlayerListHeaderFooter.class,
471-
@@ -231,6 +247,7 @@ public enum Protocol
502+
@@ -230,7 +246,8 @@ public enum Protocol
503+
map( ProtocolConstants.MINECRAFT_1_12_1, 0x4A ),
472504
map( ProtocolConstants.MINECRAFT_1_13, 0x4E ),
473505
map( ProtocolConstants.MINECRAFT_1_14, 0x53 ),
474-
map( ProtocolConstants.MINECRAFT_1_15, 0x54 )
506+
- map( ProtocolConstants.MINECRAFT_1_15, 0x54 )
507+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x54 ),
475508
+ map( ProtocolConstants.MINECRAFT_1_16, 0x54 )
476509
);
477510
TO_CLIENT.registerPacket(
478511
EntityStatus.class,
479-
@@ -240,18 +257,21 @@ public enum Protocol
512+
@@ -239,19 +256,22 @@ public enum Protocol
513+
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
480514
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
481515
map( ProtocolConstants.MINECRAFT_1_14, 0x1B ),
482-
map( ProtocolConstants.MINECRAFT_1_15, 0x1C )
516+
- map( ProtocolConstants.MINECRAFT_1_15, 0x1C )
517+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x1C ),
483518
+ map( ProtocolConstants.MINECRAFT_1_16, 0x1C )
484519
);
485520
TO_CLIENT.registerPacket(
486521
Commands.class,
487522
Commands::new, // Waterfall - speed up packet construction
488523
map( ProtocolConstants.MINECRAFT_1_13, 0x11 ),
489-
map( ProtocolConstants.MINECRAFT_1_15, 0x12 )
524+
- map( ProtocolConstants.MINECRAFT_1_15, 0x12 )
525+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
490526
+ map( ProtocolConstants.MINECRAFT_1_16, 0x12 )
491527
);
492528
TO_CLIENT.registerPacket(
493529
ViewDistance.class,
494530
ViewDistance::new, // Waterfall - speed up packet construction
495531
map( ProtocolConstants.MINECRAFT_1_14, 0x41 ),
496-
map( ProtocolConstants.MINECRAFT_1_15, 0x42 )
532+
- map( ProtocolConstants.MINECRAFT_1_15, 0x42 )
533+
+ map( ProtocolConstants.MINECRAFT_1_15, 0x42 ),
497534
+ map( ProtocolConstants.MINECRAFT_1_16, 0x42 )
498535
);
499536

0 commit comments

Comments
 (0)