Commit Graph

1938 Commits

Author SHA1 Message Date
Myles
390653a9a6 Merge branch 'master' into abstraction 2019-06-19 09:42:01 +01:00
Myles
0cd04381a4 Merge branch 'master' into dev 2019-06-19 09:41:06 +01:00
Myles
dcefaa6b19
Merge pull request #1367 from Gerrygames/master
Fix 1.13 chunk reading, fix 1.9 chunk type not using global palette
2019-06-19 09:40:26 +01:00
Gerrygames
3063538ad0 fix 1.13 chunk reading, fix 1.9 chunk type not using global palette 2019-06-14 17:50:14 +02:00
Myles
604b694709
Merge pull request #1366 from KennyTV/dev
1.14.3 pre-3
2019-06-14 10:33:16 +01:00
KennyTV
1c9309ac98 1.14.3 pre-3 2019-06-14 11:17:38 +02:00
Myles
e7c89f28ba
Merge pull request #1363 from KennyTV/dev
1.14.3 pre-2
2019-06-07 13:41:30 +01:00
KennyTV
97a8f41e12 1.14.3 pre-2 2019-06-07 12:36:37 +02:00
Myles
be5bf7961e Merge branch 'master' into dev 2019-06-05 15:56:29 +01:00
Myles
318db58be1 Servers older than 1.13.2 have a length limit on plugin message name 2019-06-05 15:55:55 +01:00
Myles
0deed6e00d
Merge pull request #1359 from KennyTV/dev
1.14.3 pre-1
2019-06-03 21:01:57 +01:00
KennyTV
5ad9d51fb0 Set version to 2.1.2 2019-06-03 21:59:19 +02:00
KennyTV
907b5e020c Change new trade list boolean 2019-06-03 21:20:32 +02:00
KennyTV
a8d13fadb3 1.14.3 pre-1 2019-06-03 20:21:33 +02:00
Myles
0137105a6d Fix #1358 by checking for null before processing 2019-05-31 20:43:02 +01:00
Myles
5364d89ca8 Implement hashCode for version 2019-05-27 18:10:57 +01:00
Myles
744fa25349 Fix several NPE cases, apply final to relevant fields, remove unused code
The suggested changes were found with FindBugs, some of these bugs may be rare cases.
2019-05-27 17:50:08 +01:00
Myles
3027490256 Merge branch 'master' into abstraction 2019-05-27 17:29:04 +01:00
Myles
89dfcaf626 Back to SNAPSHOT 2019-05-27 13:37:16 +01:00
Myles
4fb0738c1a
Merge pull request #1356 from Gerrygames/1.14.2
1.14.2
2019-05-27 13:24:38 +01:00
Gerrygames
e8f4f7049b 1.14.2 2019-05-27 14:23:00 +02:00
Myles
0087e382ed
Merge pull request #1354 from Gerrygames/1.14.2
1.14.2-pre4
2019-05-24 17:37:27 +01:00
Gerrygames
eb9e48ecdc 1.14.2-pre4 2019-05-24 18:25:55 +02:00
Myles
34f8451ac5
Merge pull request #1352 from KennyTV/master
Fix minecart mapping
2019-05-22 17:41:57 +01:00
KennyTV
894503d56b Fix minecart mapping 2019-05-22 18:35:50 +02:00
Myles
ee8c3d609f
Merge pull request #1351 from KennyTV/dev
1.14.2-pre3
2019-05-22 16:24:13 +01:00
KennyTV
b2c1c24902 1.14.2-pre3 2019-05-22 16:54:25 +02:00
Myles
6e8ea8689b
Merge pull request #1349 from KennyTV/master
Add dolphin to Entity1_13Types
2019-05-22 14:44:20 +01:00
KennyTV
7fcb489f38 Add dolphin to Entity1_13Types 2019-05-22 15:25:42 +02:00
Myles
10b0a6fbb6 Merge branch 'master' into dev 2019-05-21 18:07:00 +01:00
Myles
ecc1cce033
Merge pull request #1348 from KennyTV/master
Fix suffocation damage for 1.14+ players in hitbox patch
2019-05-21 18:06:20 +01:00
KennyTV
10d8ce86b3 Use weakhashmap 2019-05-21 19:02:03 +02:00
Myles
b0fc69c308
Merge pull request #1339 from KennyTV/abstraction
Remove duplicated code in configs and EntityType
2019-05-21 17:49:53 +01:00
KennyTV
5cc421cff9 Don't cancel normal suffocation 2019-05-20 10:30:42 +02:00
KennyTV
ca1ba4f422 Fix suffocation damage for 1.14+ players in hitbox patch 2019-05-19 23:28:05 +02:00
Myles
a2d9489ad5
Merge pull request #1344 from astei/dont-send-empty-register
Don't try to send register messages without channels
2019-05-17 23:08:43 +01:00
Andrew Steinborn
232ee9b63b Don't try to send register messages without channels
Bukkit interprets this as attempting to register the channel "" (the
empty string), which fails on Minecraft 1.13 and above.
2019-05-17 18:01:58 -04:00
Myles
7861c76730
Merge pull request #1342 from KennyTV/dev
1.14.2-pre2
2019-05-17 14:24:15 +01:00
KennyTV
d7aa23681b 1.14.2-pre2 2019-05-17 15:15:21 +02:00
Myles
b75016a186 Merge branch 'master' into dev 2019-05-17 11:59:59 +01:00
Myles
6882b7074c Fix #1333 pandas missing 2019-05-17 11:59:46 +01:00
Myles
83bca3c23f
Merge pull request #1341 from Gerrygames/1.14.2
1.14.2-pre1
2019-05-16 18:26:55 +01:00
Gerrygames
a075e31a4e 1.14.2-pre1 2019-05-16 19:21:26 +02:00
Myles
bdd32688fa
Merge pull request #1330 from kashike/cleanup
Reduce duplication in various classes
2019-05-15 22:24:27 +01:00
Myles
cb857d828f
Merge pull request #1340 from KennyTV/master
Support latest Velocity changes
2019-05-15 22:23:37 +01:00
KennyTV
440d469fa2 Update to latest Velocity build 2019-05-15 23:16:01 +02:00
KennyTV
82da5e5a60 Fix MappingData reference 2019-05-15 13:37:23 +02:00
KennyTV
a191d0de16 Reduce code duplication MappingData in (also regarding future versions) 2019-05-15 13:32:29 +02:00
KennyTV
ae6cff5325 Remove deprecated config methods 2019-05-15 12:48:40 +02:00
KennyTV
eb9520cdc3 Reduce duplicated code in config classes 2019-05-15 12:22:56 +02:00