1593 Commits

Autor	SHA1	Nachricht	Datum
KennyTV	414f561673	Use FU collections in ChunkSection, pre-size palette	2020-09-08 11:10:16 +02:00
KennyTV	074edf1b48	Fix falling block id rewrite	2020-09-08 11:01:00 +02:00
KennyTV	a0a229fa29	Make pipeline fail-safe limit changeable ... ☠	2020-09-08 09:06:54 +02:00
KennyTV	ebdadf0774	Fix version name	2020-09-07 15:44:14 +02:00
KennyTV	5b09536dcf	1.16.3-rc1	2020-09-07 15:11:11 +02:00
KennyTV	1ea548f05d	Avoid List creation and collection reversal in transforming	2020-09-06 12:42:37 +02:00
KennyTV	b7bf993795	Warn with unmapped id when missing	2020-09-04 11:04:44 +02:00
KennyTV	a709382d25	Fix NPE	2020-09-04 11:04:44 +02:00
KennyTV	d36def89e1	Abstract mapping loading	2020-09-04 11:04:44 +02:00
KennyTV	074af0e282	Fix typo in config	2020-09-02 15:45:39 +02:00
BGMP	f53a6928f2	Fix IOB in 1.13 recipe request	2020-08-31 05:59:19 -04:00
KennyTV	78bb5f171f	Fix IOB in 1.13 recipe request ... Fixes #2039	2020-08-27 09:37:51 +02:00
RK_01	cae5122d04	Applied suggestions for PR ... Co-authored-by: Nassim <jahnke.nassim@gmail.com>	2020-08-25 15:53:58 +02:00
RaphiMC	0070485d2e	fixed 1.9 -> 1.8 enderman held item metadata translation	2020-08-25 15:43:21 +02:00
RednedEpic	7e03da66d4	Rework inventory workaround to cancel animation if in an open inventory ... On 1.16, when sending a new inventory while another one is open (without explicitly calling `closeInventory` first), a hand swing is sent from the client, which the server handles like any normal arm swing. This in turn results in the `PlayerInteractEvent` and `PlayerAnimationEvent` both being called on Bukkit's end, which are used to detect for left clicks. If an item in the player's hand opens a menu when left clicked and the above is true, this results in that menu being reopened.	2020-08-22 13:25:00 -05:00
Jo0001	be31c705b5	Use https for GitHub issue link	2020-08-22 11:44:51 +02:00
Nassim	13ee674d96	Merge pull request #2028 from astei/optimize/improve-inlining-transform ... Fix bad ProtocolPipeline changes	2020-08-21 22:25:41 +02:00
Andrew Steinborn	d31310ace8	Fix bad ProtocolPipeline changes	2020-08-21 16:21:01 -04:00
Nassim	1afed864b1	Merge pull request #2011 from astei/optimize/improve-inlining-transform ... Make several tweaks to Protocol to improve inlining and performance on hot paths	2020-08-21 21:43:07 +02:00
frengor	2dcd832a29	Fix Wrong AutoTeam Color	2020-08-21 01:58:34 +02:00
KennyTV	f54bb7923b	Revert "Fix 1.13 component rewriter npe" ... This reverts commit 1b862d08	2020-08-18 10:07:52 +02:00
KennyTV	1b862d084b	Fix 1.13 component rewriter npe	2020-08-18 10:06:52 +02:00
Andrew Steinborn	fc7a7396ef	Make several tweaks to Protocol to improve inlining and performance on hot paths	2020-08-17 19:37:55 -04:00
KennyTV	be6e086aac	Add note to 1.9 update sign packet creation	2020-08-17 21:37:17 +02:00
connorhartley	f3d8b47add	Use ClientboundPackets1_16#CLOSE_WINDOW instead of byte for packet ID	2020-08-17 11:09:12 +12:00
connorhartley	d3cadaf90f	Close the open inventory before opening a new one on 1.16	2020-08-17 10:08:56 +12:00
connorhartley	a4920a2c74	Ensure normal keys that end with numbers dont get matched and replaced	2020-08-17 00:20:39 +12:00
KennyTV	37170a2180	Fix parsing of custom recipes ... Fixes #1995	2020-08-16 10:18:08 +02:00
Andrew Steinborn	338b8792a9	Remove useless URL detection and event addition from 1.13->1.12.2 ChatRewriter	2020-08-16 01:47:14 -04:00
KennyTV	7163d38ddf	Rewrite statistics category ids ... Thanks to RaphiMC for providing the statistic mappings	2020-08-13 13:31:14 +02:00
KennyTV	b0fc931ecd	Fix empty compound reading	2020-08-13 08:31:06 +02:00
KennyTV	0ec1116a9e	Rewrite block/item/entity ids in statistics ... Still todo: Rewrite change in category ids in various versions	2020-08-12 22:15:48 +02:00
KennyTV	e45c82ee87	Merge remote-tracking branch 'origin/dev' into master	2020-08-12 22:15:16 +02:00
RaphiMC	acfdbc5494	slight code changes for PR	2020-08-12 17:16:50 +02:00
RK_01	70d08dfc6f	fixed 1.13 -> 1.12.2 statistics remapping	2020-08-12 16:39:01 +02:00
RK_01	dfc4652da7	added 1.12 -> 1.11.1 achievement message translation	2020-08-12 16:38:21 +02:00
Jo0001	9c61135a73	Link to ViaSetup	2020-08-12 15:33:20 +02:00
KennyTV	f7951e7ef9	Fix falling block 1.16.1->1.16.2 remapping ... Fixes #1985	2020-08-12 14:04:12 +02:00
creeper123123321	53d22dcff7	back to snapshot	2020-08-11 13:48:26 -03:00
KennyTV	6060954f87	3.1.0 Release - 1.16.2 support	2020-08-11 12:44:41 +02:00
KennyTV	ff8a27d92a	Fix multi block change not being sent ... Tfw when the ugly logic works but you just didn't send the packet	2020-08-11 12:38:45 +02:00
Koppe	93c84b1912	minor code improvements	2020-08-10 22:28:40 +02:00
Koppe	0b17b81b63	fixed 1.11 -> 1.10.2 potion data remapping	2020-08-10 22:17:31 +02:00
KennyTV	6a7a92a97b	Remove ClientChunk from 1.14+ chunk types ... Apparently multiple people (including me) blindly copied that from older versions. Also removed join/respawn from the abstract MetadataRewriter, since they were only used twice each.	2020-08-10 21:22:01 +02:00
KennyTV	31f7bde35f	Some MetadataRewriter cleanup	2020-08-10 18:32:23 +02:00
KennyTV	da77c32a0d	1.16.2-rc2	2020-08-10 14:53:32 +02:00
KennyTV	421453d25e	Fix 1.8->1.9 ender dragon sound ... Fixes #1943	2020-08-10 09:22:08 +02:00
KennyTV	fa4d44b929	Update rc1 mappings	2020-08-07 17:48:58 +02:00
KennyTV	7c8b56b3cb	1.16.2-rc1	2020-08-07 17:35:48 +02:00
KennyTV	f6fec5b93b	1.16.2-pre3 (almost) ... The Nether does not have its custom fog, no idea why yet	2020-08-06 20:21:54 +02:00
KennyTV	ea0f91136e	Accept plain strings for components ... Addresses #1968	2020-08-06 10:15:38 +02:00
KennyTV	cf7d49aec5	1.16.2-pre2	2020-08-05 18:19:00 +02:00
KennyTV	2b50f6c713	Merge branch 'master' into dev ... # Conflicts: # pom.xml	2020-08-03 08:40:53 +02:00
KennyTV	be2ba2b1b9	Fix Chat meta type ... Fixes #1949	2020-08-03 08:39:58 +02:00
creeper123123321	8fe1648d6b	Explain chatrewriter changes	2020-08-02 12:37:36 -03:00
KennyTV	49211240a3	1.16.2-Pre1	2020-07-29 17:22:04 +02:00
KennyTV	89c503dd92	Print erroneous json if parsing fails	2020-07-28 09:59:35 +02:00
Gerrygames	50024b0602	fix global palette value	2020-07-25 17:56:42 +02:00
KennyTV	5503a338fa	Check for register/unregister channels with long names	2020-07-23 19:31:37 +02:00
KennyTV	48f8412440	20w30a	2020-07-22 21:47:18 +02:00
KennyTV	2c9ce50312	Bump version to 3.1.0-	2020-07-22 09:17:28 +02:00
KennyTV	601a6eb808	Set mapping load thread name, config comment change ... Closes #1922	2020-07-21 09:10:16 +02:00
KennyTV	647230a996	Move long plugin channel name check to a config option	2020-07-19 17:30:03 +02:00
KennyTV	5047aaff0c	Fix 1.12->1.13 recipe type switcheroo ... Fixes #1918	2020-07-19 13:37:41 +02:00
KennyTV	a16a085f75	Print exceptions during mapping loading	2020-07-16 19:27:56 +02:00
KennyTV	37f5948b0a	20w29a	2020-07-15 17:44:24 +02:00
KennyTV	7fa80e1759	Use buffered stream for compressed nbt reading ... (See tux' open pr at adventure)	2020-07-15 12:10:24 +02:00
KennyTV	e1464044a7	Use Map in RecipeRewriter, use correct names for 1.13/1.14 rewriters	2020-07-15 11:42:59 +02:00
KennyTV	42167394e0	Make 1.16 default registry public	2020-07-11 22:26:54 +02:00
KennyTV	3ef1912267	Map biomes, fix registry sending	2020-07-09 14:31:19 +02:00
KennyTV	3c20b79573	Implement multi block change packet changes	2020-07-08 21:51:56 +02:00
KennyTV	7171802b78	20w28a	2020-07-08 21:01:18 +02:00
KennyTV	58e7455cd9	Fix NPE on proxies in ViaIdleThread ... Fixes #1878	2020-07-04 13:22:51 +02:00
KennyTV	a613edcb42	Fix legacy nbt io ... Fixes #1874	2020-07-02 16:35:33 +02:00
KennyTV	5ce1e850c8	Rewrite item nbt attributes	2020-07-02 15:57:52 +02:00
KennyTV	4f392ba361	Suffix snapshot version again ... (Now accepted by ViaFabric)	2020-07-02 15:57:52 +02:00
KennyTV	61fb1c249c	Wrap exceptions in remappers to InformativeEx	2020-07-02 15:57:52 +02:00
KennyTV	dae83d0e36	Wrap exceptions in remappers to InformativeEx	2020-07-02 11:08:59 +02:00
KennyTV	67c5e78e7b	Cleanup declare recipe, trade list, and advancement packets	2020-07-02 00:18:33 +02:00
KennyTV	1ec2551fcc	Change version back to 3.0.2-SNAPSHOT ... Spam is over, I promise	2020-07-01 20:42:07 +02:00
KennyTV	d4a299501a	Add piglin brute to entity types	2020-07-01 20:21:38 +02:00
KennyTV	3fbeb3e902	Actually fix hardcore flag	2020-07-01 20:07:20 +02:00
KennyTV	7f2023176f	Fix hardcore flag	2020-07-01 20:02:44 +02:00
KennyTV	3ddd289b49	20w27a ... TODO: Yoink recipe rewriter from ViaBackwards	2020-07-01 19:44:11 +02:00
KennyTV	f16ff65933	Move handshake exceptions filter to exceptionCaught handling	2020-07-01 13:22:00 +02:00
KennyTV	96485c444e	Filter new blocks/items in tag rewriting ... Fixes ViaVersion/ViaBackwards#219	2020-07-01 09:40:18 +02:00
KennyTV	b99b79f44a	Only print handshake errors when debug is enabled ... The exceptions only now showed up with the new print handling, but 100% of the printed cases have just been invalid packets, which we can (and should) just ignore. Fixes #1854	2020-07-01 09:11:46 +02:00
KennyTV	3ba2191829	Fix late Bungee connection cancelling	2020-06-30 13:51:06 +02:00
KennyTV	26de3fe573	Cancel lengthy plugin channels on Spigot ... Fixes #1859	2020-06-30 09:35:37 +02:00
KennyTV	d59749fb03	Fix legacy nbt parsing	2020-06-29 18:06:23 +02:00
KennyTV	a0195c59cc	Handle lore in show_item in 1.13->1.14 ... Also print out nbt if reading/writing fails	2020-06-28 22:19:59 +02:00
KennyTV	26b90b6d71	Fix accidental casting ... Might have forgotten to actually commit this, whoopsie	2020-06-28 20:44:45 +02:00
KennyTV	b203db3ce5	Minor formatting change	2020-06-28 12:35:42 +02:00
KennyTV	e386f7cf45	Fix 1.12->1.13 show_item handling ... Fixes #1603	2020-06-28 12:28:35 +02:00
KennyTV	c1c542cc5a	Fix advancement reading	2020-06-28 11:59:19 +02:00
KennyTV	642d427783	Convert component score values ... Fixes #1817	2020-06-27 23:41:46 +02:00
KennyTV	b2514a9e50	Map a few removed translation keys ... Fixes #1818	2020-06-27 19:51:42 +02:00
Nassim	a942d3aad5	Merge pull request #1840 from KennyTV/component-reading ... Directly read components as json, to only de-/serialize once	2020-06-27 17:42:25 +02:00
KennyTV	7a25645ed5	Rename some A's	2020-06-27 16:56:57 +02:00
Myles	3c23bd41dd	Merge pull request #1843 from creeper123123321/patch-3 ... Fix bossbar	2020-06-26 10:04:18 +01:00
Myles	e5ba76e006	Merge pull request #1833 from KennyTV/master ... Only print InformativeException cases in codec handlers	2020-06-26 10:03:49 +01:00
creeper123123321	7a03feeccc	Fix bossbar	2020-06-26 05:57:02 -03:00
creeper123123321	790a9d0058	inactivate userconnection correctly when there's no translation	2020-06-25 13:49:19 -03:00
creeper123123321	7ff42400c0	javadc	2020-06-25 12:07:30 -03:00
creeper123123321	3df7f760a6	warn about duplicate uuids	2020-06-25 11:50:12 -03:00
KennyTV	3a48e54e52	Directly read components as json, to only de-/serialize once	2020-06-25 16:41:39 +02:00
creeper123123321	73eef1727a	make isFrontEnd public	2020-06-25 11:41:38 -03:00
creeper123123321	1ab0cd07af	Use return value from add/remove and add abstract isFrontEnd	2020-06-25 11:40:15 -03:00
creeper123123321	9df545483c	Fix when client doesn't have id	2020-06-25 11:28:30 -03:00
creeper123123321	3f93bb051d	Redirect UUID to UserConnection bossbars	2020-06-25 11:25:59 -03:00
creeper123123321	8bd982a412	fix number comparing	2020-06-25 11:00:43 -03:00
creeper123123321	7b200ad264	dont use uuids for bossbars, use userconnection	2020-06-25 10:50:34 -03:00
KennyTV	5d2a4e2ef3	Add sanity check to conduit nbt handling	2020-06-25 12:52:59 +02:00
KennyTV	d414106d5a	Only print InformativeException cases in codec handlers	2020-06-25 12:51:51 +02:00
KennyTV	6761489ebf	Also handle the block entity data packet for nbt ... Fixes #1816	2020-06-25 11:18:07 +02:00
KennyTV	f91ddb2521	Hotfix RGB Bungee legacy insertions ... Fixes #1838 We should at some point completely remove the Bungee chat lib and handle everything with plain json ourselves	2020-06-25 09:57:26 +02:00
Myles	3ee94415a9	Back to snapshot	2020-06-24 13:34:17 +01:00
Myles	1a7ce908b8	Release	2020-06-24 13:16:45 +01:00
KennyTV	d3fb7cd91b	1.16.1	2020-06-24 14:10:33 +02:00
KennyTV	8b61d168f7	Send remaining (empty) tags ... Fixes #1830	2020-06-24 14:05:52 +02:00
KennyTV	5b807a9f17	Fix motd reading in some cases ... Fixes #1826	2020-06-23 23:33:59 +02:00
KennyTV	f671a4fa5c	Work around player sample line breaks ... Fixes #1819	2020-06-23 20:01:01 +02:00
KennyTV	0b1c210f77	Fix component read length ... Fixes #1822, fixes #1696	2020-06-23 19:15:20 +02:00
KennyTV	9220c5ae40	Remap ocelots to cats in 1.13->1.14 again ... Fixes #1815	2020-06-23 17:43:05 +02:00
KennyTV	f391cc6185	Send impact_projectiles enttiy tag	2020-06-23 17:30:37 +02:00
KennyTV	b0fe7d9c6d	Also add wooden_trapdoors item tag	2020-06-23 17:13:11 +02:00
KennyTV	3d39f0d304	Fix wooden_trapdoors tag checking	2020-06-23 16:31:00 +02:00
Myles	42029770a2	Back to snapshot	2020-06-23 14:40:22 +01:00
Myles	cf00b9ee7c	3.0.0	2020-06-23 14:07:27 +01:00
Myles	b0816b1ce6	Merge pull request #1812 from KennyTV/abstraction ... Revert removal of concurrency hacks	2020-06-22 17:15:11 +01:00
KennyTV	67cce53b72	Revert removal of concurrency hacks ... Apparently still causes issues with PS, we'll investigate this properly at a later date	2020-06-22 17:45:10 +02:00
Myles	0c097d7467	Merge pull request #1810 from KennyTV/abstraction ... Fix 1.16 Bungee compat	2020-06-22 16:33:25 +01:00
KennyTV	70e142e4c4	Fix 1.16 Bungee compat ... Moved the version hack outside of the BaseProtocol class into separate impls with properly checking the sent version	2020-06-22 17:02:25 +02:00
KennyTV	9f104866b2	Prepare for 1.16	2020-06-22 16:10:34 +02:00
KennyTV	7ec9eb08d9	Fix banner item color in 1.12->1.13 ... Fixes #1809	2020-06-22 10:20:00 +02:00
KennyTV	7595ca0c40	Avoid a bit of overhead in manual primitive type reading ... Mostly interesting for proper object type reading (arrays, chunks, etc.) that manually call the type read/write methods + packet varint channel id	2020-06-18 19:38:47 +02:00
KennyTV	5a15d34d9e	1.16 rc1	2020-06-18 15:48:33 +02:00
KennyTV	cc500e4681	1.16 pre8	2020-06-17 18:03:22 +02:00
KennyTV	4c7cf56655	Fix future entity equip reading	2020-06-16 21:04:29 +02:00
KennyTV	9785878d87	1.16 pre7	2020-06-16 18:50:50 +02:00
KennyTV	6cd6c87127	1.16 pre6	2020-06-15 20:11:21 +02:00
KennyTV	b9889d2c45	1.16 pre5	2020-06-12 17:18:06 +02:00
KennyTV	7924dfeab2	Remove -1 tag workaround, fixed in pre4	2020-06-11 19:36:35 +02:00
KennyTV	989c0bf55f	1.16 pre4	2020-06-11 19:30:52 +02:00
KennyTV	e1b2702231	1.16 pre3	2020-06-10 19:36:05 +02:00
KennyTV	029f399a14	Rename ViaCodecException to CancelCodecException	2020-06-10 08:58:40 +02:00
KennyTV	7588609c56	Fix cancelexception printing	2020-06-09 21:29:19 +02:00
KennyTV	6513df10e7	Explicitly cast json loaded map in BlockIdData ... Else json will start to cry sometimes	2020-06-09 20:38:50 +02:00
KennyTV	d14a74f29e	Change CancelException message	2020-06-09 20:05:35 +02:00
Myles	2f9c66eafb	Merge pull request #1505 from creeper123123321/nettyhandlerabstraction ... Netty handler tidy	2020-06-09 17:10:06 +01:00
KennyTV	ad1707f0ee	Fixup docs	2020-06-09 17:57:14 +02:00
KennyTV	aa59ed112a	Fixup docs, remove ConcurrentList	2020-06-09 17:53:31 +02:00
Myles	7be8c9d8aa	Merge pull request #1799 from KennyTV/abstraction ... Use FastUtil collections for frequently called code	2020-06-09 15:50:23 +01:00
KennyTV	f408a5d4c6	Add last load factors	2020-06-09 08:38:22 +02:00
KennyTV	5d8084986f	Put itemmappings into custom Int2IntBiMap	2020-06-08 23:54:24 +02:00
KennyTV	5bd1ef882e	Set load factor to 1 for deterministically sized collections	2020-06-08 23:13:47 +02:00
KennyTV	6167c3b526	Set default return values	2020-06-08 23:01:55 +02:00
KennyTV	8188ae09f5	Use proper FU classes, shade dumbed down version	2020-06-08 22:23:24 +02:00
KennyTV	9c81ba368f	Cancel block change packets for removed actions	2020-06-08 17:46:18 +02:00
KennyTV	39cb8fd554	Fix FU check	2020-06-08 15:58:10 +02:00
KennyTV	623cdaf881	Getter for original map in IntMap	2020-06-08 15:34:34 +02:00
KennyTV	1ad559212e	Create soft wrapper for FU Int2ObjectMap	2020-06-08 13:49:26 +02:00
KennyTV	30e10bb645	Create soft wrapper for FU IntSet and Int2IntMap	2020-06-08 12:27:34 +02:00
KennyTV	df495f8131	Remove accidental import	2020-06-07 16:29:15 +02:00
KennyTV	529da10615	Move ProtocolInfo into its own field	2020-06-07 12:19:36 +02:00
KennyTV	f2d6691af7	Minor javadoc changes	2020-06-07 11:32:49 +02:00
creeper123123321	a8a1e9448e	Netty handler tidy	2020-06-07 10:41:29 +02:00
KennyTV	5fca206b8d	Add method to get protocol instance by class	2020-06-07 10:16:40 +02:00
KennyTV	25652eab15	Print protocol and packet type when erroring	2020-06-06 16:16:38 +02:00
KennyTV	f117239184	Further safety checks for correct packets types	2020-06-06 15:54:51 +02:00
KennyTV	cc3dae127b	Use correct packet type when warning for missing mapping	2020-06-06 15:33:20 +02:00
KennyTV	baf1b851c4	1.8 packet enum, add a small number of nullable annotations	2020-06-06 10:55:35 +02:00
KennyTV	545ab2de79	Enforce correct packet types with generics, 1.9 packet constant	2020-06-06 09:45:43 +02:00
KennyTV	38f845bb7e	Consistency changes, 1.11->1.12 packet constants ... Almost there! :>	2020-06-05 23:06:00 +02:00
KennyTV	9f80553749	Safety checks, packet type constants for 1.12->1.13 protocol	2020-06-05 22:33:48 +02:00
KennyTV	d7d4e58106	Packet type constants and auto channel mapping	2020-06-05 20:48:35 +02:00
KennyTV	9a59c40ce1	Fix dimension registry data	2020-06-05 14:02:09 +02:00
KennyTV	8a00e260f6	Pre 2 protocol bump	2020-06-05 13:22:58 +02:00
KennyTV	1285a0c6bf	1.16-pre1	2020-06-05 00:42:39 +02:00
KennyTV	eb9d913cb6	Add toString, equals, and hashCode to Metadata	2020-06-03 11:19:54 +02:00
KennyTV	796a42c981	Send new 20w22a tags	2020-05-29 20:36:40 +02:00
KennyTV	a9e2544188	20w22a	2020-05-29 15:14:18 +02:00
KennyTV	bea01bc794	Fix respawn reading	2020-05-23 12:46:15 +02:00
KennyTV	799c933d95	Make SoundRewriter fields protected	2020-05-23 11:14:50 +02:00
KennyTV	6b9e67f96b	Sound rewriter cleanup - don't send -1 sound ids ... Addresses #1783	2020-05-23 10:56:27 +02:00
KennyTV	af3023562d	Fix dimension identifier	2020-05-20 17:02:22 +02:00
KennyTV	92f4e3dd81	20w21a	2020-05-20 16:44:12 +02:00
Myles	f7eb445d61	Merge pull request #1775 from KennyTV/abstraction ... 20w20a	2020-05-16 16:22:35 +01:00
KennyTV	98b77278cd	20w20b	2020-05-14 11:53:27 +02:00
FivePB (Xer)	1394c70981	Shouldn't try to write helpful messages when drunk	2020-05-13 20:56:15 +02:00
FivePB (Xer)	595b8c3b56	Yes much tree	2020-05-13 20:50:28 +02:00
FivePB (Xer)	27cbd844f0	Much fighting over this mess(age)	2020-05-13 20:48:51 +02:00
KennyTV	5c5c1ed402	20w20a	2020-05-13 18:08:33 +02:00
KennyTV	245c7e8219	Add wall_post_override blocktag	2020-05-12 22:51:02 +02:00
KennyTV	25d54ae229	Add runnable list to be executed before the full init	2020-05-09 09:46:15 +02:00
Gerrygames	5009ffbb5a	handle new window type in 1.16	2020-05-08 01:36:24 +02:00
KennyTV	47b43402f5	20w19a	2020-05-06 19:11:05 +02:00
konwboy	222c03aa67	Fix block connections causing issues with TNT	2020-05-05 19:49:59 +02:00
Myles	d5ff2b5b63	Merge pull request #1735 from KennyTV/abstraction ... Add fire connection handler	2020-05-02 15:35:38 +01:00
Gerrygames	93d21efd3d	fix enchantments in enchanting table for 1.16	2020-04-29 21:10:05 +02:00
KennyTV	19201134a8	20w18a	2020-04-29 18:09:57 +02:00
KennyTV	da2f153a43	Share JsonParser instance	2020-04-27 14:41:57 +02:00
KennyTV	24ebb77860	Directly add dependent futures to the list instead of waiting for the extra boolean	2020-04-24 13:48:22 +02:00
KennyTV	e4bac5f81a	Improve shutdown of executor loader and mappings cache ... Previously, the shutdown check would only happen once all futures were removed, as in a player joined that had to check the remaining protocols. Now, the check will be done regularly once the plugin has fully been enabled and has the option to delay the shutdown until set on again (i.e. with ViaBackwards)	2020-04-24 13:27:29 +02:00
KennyTV	4b9a15b003	Some javadoc changes	2020-04-24 11:39:11 +02:00
KennyTV	32826467d3	Wrap reflectiveoperationexception in concurrentlist clone	2020-04-23 21:42:08 +02:00
KennyTV	886ac734f9	Add null check to channel close	2020-04-23 21:09:41 +02:00
KennyTV	762c66ff42	Farewell, lombok!	2020-04-23 21:07:12 +02:00
KennyTV	53b8c2328e	Uncache UserConnection on channel close, fix memory leak	2020-04-23 20:24:16 +02:00
KennyTV	578c661730	Check if player is handled by Via on disconnect	2020-04-22 22:11:01 +02:00
KennyTV	a82bbc4e66	Replace keyset map lookups with value iterator	2020-04-22 21:47:14 +02:00
KennyTV	867cd4ee39	Move heightmap code above block entity check	2020-04-22 21:46:14 +02:00
Myles	f7b841faf3	Merge pull request #1742 from Gerrygames/abstraction ... convert height maps, fix 1.16 chunk reading	2020-04-22 20:44:47 +01:00
Gerrygames	b80902ec10	convert height maps, fix 1.16 chunk reading	2020-04-22 21:42:11 +02:00
Myles	90386cd0de	Merge pull request #1741 from Gerrygames/abstraction ... 20w17a	2020-04-22 18:15:02 +01:00
Gerrygames	e22bba0360	20w17a, update entity types renamed in 1.13	2020-04-22 19:04:53 +02:00
Myles	2734b18d07	Block connections true by default ... While we didn't have this enabled when it launched, most of the bugs are gone and the number of people using this option is pretty high.	2020-04-19 18:59:38 +01:00
KennyTV	3a5a47aaa2	Add fire connection handler	2020-04-19 15:57:59 +02:00
KennyTV	c956f23def	Add safety checks to skullowner conversion	2020-04-17 21:02:51 +02:00
KennyTV	0f90efa05f	Add subplatform versions to dumps	2020-04-17 20:52:55 +02:00
KennyTV	83a6346a8d	Add git commit hash to dumps	2020-04-16 21:39:28 +02:00
Myles	d9291e6457	Merge pull request #1719 from creeper123123321/portedplayerschange ... Remove portedPlayers field, let platform handle players	2020-04-15 23:11:09 +01:00
KennyTV	b03dfa9951	20w16a	2020-04-15 17:53:02 +02:00
creeper123123321	dd5cbb0e4c	Merge branch 'abstraction' of https://github.com/ViaVersion/ViaVersion into portedplayerschange	2020-04-15 11:39:13 -03:00
creeper123123321	17881b342a	javadoc, remove ViaAPIs getPortedPlayers, fix ViaManager.getPortedPlayers name, rename to ViaAPI#isInjected	2020-04-15 11:35:09 -03:00
Myles	47e50d035f	Merge pull request #1724 from KennyTV/abstraction ... Fix 1.15 EntityToggleGlideEvent cancelling on Bukkit	2020-04-14 17:58:14 +01:00
Myles	5af9f025d8	Merge pull request #1379 from creeper123123321/1_8inconsistencyfix ... Fix inconsistent types in block placement	2020-04-14 17:43:20 +01:00
KennyTV	8f08a32c5a	Bai bai to more lombok usage once more	2020-04-13 20:58:24 +02:00
creeper123123321	a91c72fb44	position fix	2020-04-13 14:42:48 -03:00
creeper123123321	99abe3994c	use short	2020-04-13 14:33:00 -03:00
creeper123123321	a0e3d70a3f	unsigned byte	2020-04-13 14:01:28 -03:00
creeper123123321	a105c5cb11	Make getPortedPlayers() private, update bungee-api, remove some lombok usage, create ViaConnectionManager	2020-04-12 16:47:32 -03:00
creeper123123321	ca78bf9851	Remove portedPlayers field, let platform handle players	2020-04-12 15:37:08 -03:00
creeper123123321	f8def524aa	Run Velocity server change logic on event loop	2020-04-12 14:50:54 -03:00
KennyTV	721808d71d	20w15a	2020-04-08 16:15:53 +02:00
Myles	3c9c61056d	Merge pull request #1689 from KennyTV/abstraction ... Asynchronously load mapping data	2020-04-05 21:54:04 +01:00
KennyTV	df702736bf	Readd block entity wrapping	2020-04-04 00:37:06 +02:00
KennyTV	3737242226	Cleanup chunk types	2020-04-04 00:32:00 +02:00
KennyTV	ebff5e2f4d	Adapt tagdata loading	2020-04-03 19:57:07 +02:00
KennyTV	081781f223	Some cleanup	2020-04-03 19:32:31 +02:00
KennyTV	c570f4a972	Minor change	2020-04-03 19:32:31 +02:00
KennyTV	563c5f830d	Don't expose executor and future map	2020-04-03 19:32:30 +02:00
KennyTV	248fd92f6e	Use CompletableFuture.runAsync	2020-04-03 19:32:30 +02:00
KennyTV	757654aa9d	Minor changes	2020-04-03 19:32:30 +02:00
KennyTV	e658304405	Asynchronously load mappings (until needed), create optional mappings cache for VB	2020-04-03 19:32:30 +02:00
KennyTV	b5e5118450	Minor protocol cleanup ... Removed unneeded integer boxing and empty method implementations of the user init	2020-04-03 19:32:30 +02:00
KennyTV	95db675de5	Add missing tags for client sending, cleanup	2020-04-03 17:29:40 +02:00
KennyTV	cae6addf26	Fill beacon tag in case it's fully used by the client in the future	2020-04-03 16:47:38 +02:00
KennyTV	ed26971724	Fix beacon item payment	2020-04-03 13:41:53 +02:00
KennyTV	7cdcdfa3c9	Minor cleanup to tagrewriter	2020-04-03 11:29:59 +02:00
KennyTV	8314f6c1db	Send empty non_flammable_wood itemtag as well	2020-04-03 00:03:21 +02:00
KennyTV	297fe0a538	Send empty non_flammable_wood tag	2020-04-02 23:58:06 +02:00
KennyTV	b6592b38ad	Fix zombie id	2020-04-02 23:06:05 +02:00
KennyTV	b1d6a49a82	Fix entity remap	2020-04-02 21:42:21 +02:00
KennyTV	0fcba4f4ec	Minor changes	2020-04-02 21:09:48 +02:00
KennyTV	0ee6369884	20w14a, entity name fixes, abstract tag rewriter	2020-04-02 21:03:05 +02:00
KennyTV	b941a6a422	20w13b	2020-03-26 15:39:34 +01:00
KennyTV	90f363a2be	Use correct parent for hoglin and strider	2020-03-25 19:58:38 +01:00
KennyTV	875b85b0fc	20w13a	2020-03-25 19:42:06 +01:00
Gerrygames	6b7f00ef76	fix skull items	2020-03-21 13:51:14 +01:00
KennyTV	20ce8cc288	Fix block entity uuid nbt, fix particles	2020-03-20 19:20:48 +01:00
KennyTV	6eaeb5a201	Fix login packet reading on 1.16 servers	2020-03-18 20:31:43 +01:00
Myles	f245bb8263	Merge pull request #1679 from KennyTV/abstraction ... 20w12a	2020-03-18 18:26:34 +00:00
KennyTV	f746fda5a8	Unroll uuid reading/writing	2020-03-18 19:21:48 +01:00
KennyTV	a7ab4153ef	20w12a	2020-03-18 19:15:58 +01:00
KennyTV	5057ac3d3d	Remove null check for channel in UserConnection again	2020-03-14 16:36:04 +01:00
KennyTV	7887e10bb6	20w11a	2020-03-11 22:14:08 +01:00
KennyTV	dd73ba4f72	Remove some lombok usage from the api package	2020-03-10 13:22:22 +01:00
KennyTV	2bf69c2df2	20w10a	2020-03-04 18:07:49 +01:00
KennyTV	97db997473	Fix typo	2020-02-26 18:51:27 +01:00
KennyTV	efbc246a72	20w09a	2020-02-26 18:50:30 +01:00
KennyTV	df7ef32677	20w08a	2020-02-19 18:49:17 +01:00
KennyTV	1a4945eecd	Merge branch 'master' into abstraction	2020-02-19 15:23:39 +01:00
Myles	e3e88d449d	Merge pull request #1646 from Jo0001/patch-1 ... Add link to krusics "Blocked Version Generator"	2020-02-17 10:01:42 +00:00
Myles	529f9a0e01	Fix double space and use a	2020-02-17 10:01:28 +00:00
KennyTV	c2d8b43eab	Update hoglin, add piglin entity type	2020-02-14 15:56:55 +01:00
KennyTV	6d823263ac	20w07a	2020-02-14 15:48:12 +01:00
KennyTV	5c54e8a08d	Merge branch 'master' into abstraction	2020-02-10 15:55:09 +01:00
KennyTV	7e164b40c7	Add vines blockconnection to prevent unwanted climbing ... Fixes #1640	2020-02-10 14:50:22 +01:00
KennyTV	681a0dc0e4	Remove deprecated api, remove a bit of magic	2020-02-10 10:05:56 +01:00
KennyTV	3f5500c637	Remove a bit of magic, use finals	2020-02-09 13:06:23 +01:00
KennyTV	c4b447f7b6	Handle items in cooldown packet	2020-02-08 21:33:44 +01:00
KennyTV	177b0fbf33	Fix particle mapping	2020-02-06 12:37:57 +01:00
KennyTV	2184ef19ca	20w06a, more cleanup	2020-02-05 20:09:06 +01:00
KennyTV	c33611d2d3	Cleanup 1.11 entityidrewriter	2020-02-04 15:33:36 +01:00
Jo0001	bf15415185	Add link to krusics "Blocked Version Generator"	2020-02-01 20:26:03 +01:00
KennyTV	7f6c429a55	Minor blockconnection cleanup, reduce map lookups	2020-01-28 13:31:36 +01:00
KennyTV	116706c09f	Option to (not) remap infested blocks to their normal variants ... Fixes #1642	2020-01-28 12:36:27 +01:00
KennyTV	598b51a4bf	Do not unnecessarily register tasks/listeners	2020-01-22 14:55:39 +01:00
KennyTV	b06b9c69ca	Do not unnecessarily register tasks/listeners	2020-01-22 14:14:43 +01:00
KennyTV	704f946cf7	Merge remote-tracking branch 'origin/master' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml	2020-01-21 16:07:42 +01:00
KennyTV	f9d10a9571	1.15.2 support	2020-01-21 16:05:26 +01:00
KennyTV	379c5791e6	Merge branch 'master' into dev	2020-01-20 22:15:41 +01:00
KennyTV	8569f47627	Merge branch 'dev' into abstraction	2020-01-19 19:09:57 +01:00
Gerrygames	4cf09f2e34	1.15-pre2	2020-01-16 15:58:35 +01:00
KennyTV	5d1b8dbb85	Put translation values into correct map	2020-01-16 10:39:31 +01:00
KennyTV	605b217ba4	Convert (general) 1.12.2->1.13 statistics	2020-01-15 21:51:33 +01:00
KennyTV	814bd9d85e	Merge remote-tracking branch 'origin/master' into abstraction	2020-01-15 19:13:33 +01:00
KennyTV	7f0af23f96	Fix 1.11 evocation id ... Fixes #1629	2020-01-15 18:53:26 +01:00
Myles	c64c27331a	Merge branch 'master' into dev	2020-01-14 19:12:55 +00:00
Myles	cd2ca76236	Merge branch 'master' into abstraction	2020-01-14 19:12:42 +00:00
KennyTV	538b467fa6	Fix heightmaps	2020-01-14 19:18:02 +01:00
Gerrygames	c704813a6c	1.15.2-pre1	2020-01-14 17:51:39 +01:00
Myles	86af7f054a	Merge pull request #1601 from KennyTV/abstraction ... Cleanup some block rewrite methods	2020-01-06 14:56:17 +00:00
KennyTV	3384b6bc17	Only load mappings file from dir if manually copied	2020-01-06 10:52:42 +01:00
KennyTV	4bdb566fb5	Kept the wrong defaults	2020-01-05 21:23:40 +01:00
KennyTV	5ad62a03ed	Make plugin channel mappings modifiable	2020-01-05 21:21:58 +01:00
KennyTV	5d974858fe	Some more cleanup	2019-12-20 17:53:14 +01:00
KennyTV	fddbeda81e	Back to snapshot	2019-12-20 16:29:10 +01:00
KennyTV	1c1ec10a0a	Common methods for block rewriting	2019-12-17 18:29:38 +01:00
Myles	cd9566fbc8	1.15.1 support	2019-12-17 15:28:43 +00:00
KennyTV	5a1dadf476	1.15.1	2019-12-17 14:54:51 +01:00
Myles	6eabb17f67	Merge from master	2019-12-15 09:16:53 +00:00
Myles	4f72edeaee	Merge branch 'master' into dev	2019-12-15 09:02:48 +00:00
Robin Brämer	f35b931004	fix typo	2019-12-14 22:01:50 +01:00
KennyTV	9c8a8e2e9c	Fix book edit	2019-12-14 16:22:24 +01:00
Myles	d5907711e1	Merge pull request #1576 from astei/remove-unneeded-indirection ... Remove unneeded indirection	2019-12-13 08:30:22 +00:00
Andrew Steinborn	437463f1b4	Revert "Remove indirection in byte array writing" ... This reverts commit ba08c3ad2f. Breaks the API that ViaRewind and ViaBackwards depend on.	2019-12-12 20:45:03 -05:00
creeper123123321	d6b52bcc54	Merge remote-tracking branch 'upstream/abstraction' into primitive_types	2019-12-12 15:23:32 -03:00
KennyTV	be4d071250	1.15.1-pre1	2019-12-12 16:32:53 +01:00
Andrew Steinborn	ba08c3ad2f	Remove indirection in byte array writing ... This saves us from the cost of (un)boxing bytes on the fly.	2019-12-12 00:02:09 -05:00
Andrew Steinborn	220c45b800	Remove indirection in StringType decoding	2019-12-11 23:55:44 -05:00
Andrew Steinborn	a42e724f50	Remove unneeded indirection in NBTType ... ByteBufInputStream implements DataInput, ByteBufOutputStream implements DataOutput. Use them to exploit native Netty ByteBuf calls where possible.	2019-12-11 23:51:39 -05:00
KennyTV	1002ca4016	Fix biomedata on some custom Spigot versions	2019-12-11 20:36:49 +01:00
Myles	c1b11a55d5	Back to SNAPSHOT	2019-12-11 11:16:05 +00:00
Myles	a21a2079c6	2.2.1	2019-12-11 11:12:22 +00:00
KennyTV	b7b8bdc841	Ignore unneeded sound warnings	2019-12-11 12:07:22 +01:00
KennyTV	5f46dcbab0	Merge remote-tracking branch 'upstream/master' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml	2019-12-11 09:53:09 +01:00
KennyTV	dfbe2e9739	Fix acknowledge digging ... Fixes #1564	2019-12-11 09:30:51 +01:00
Gerrygames	84624a4884	fix entity metadata in spawn packet being ignored	2019-12-11 02:10:16 +01:00
Myles	68ac978d45	Back to SNAPSHOT	2019-12-10 15:34:42 +00:00
Myles	8136eb15e1	Merge 1.15 support	2019-12-10 15:31:07 +00:00
Myles	c85d4224ad	1.15 protocol + 2.2.0	2019-12-10 15:29:26 +00:00
KennyTV	9dae40f455	Fix trade list	2019-12-09 19:30:09 +01:00
Gerrygames	44a3108982	fix wrong import - #1560	2019-12-09 19:24:18 +01:00
Gerrygames	ea045e6c34	1.15-pre7	2019-12-09 13:48:06 +01:00
Gerrygames	9174ad854c	Merge branch 'dev' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml	2019-12-09 11:52:23 +01:00
Gerrygames	cfe073cd20	fix 1.15 entity type ids	2019-12-09 11:34:00 +01:00
Myles	459871257e	Merge pull request #1528 from KennyTV/abstraction ... Hold config values in fields, add extra mappings constructor, other fixes	2019-12-08 23:08:52 +00:00
Myles	4bb4b96a10	Merge pull request #1548 from KennyTV/dev ... Convert biome data to 1.15 format	2019-12-07 10:35:44 +00:00
KennyTV	68a18df969	Take biome data from same indexes as Mojang ("middle" of 4x4x4 areas)	2019-12-07 11:31:00 +01:00
KennyTV	90e1d7236e	1.15-pre6	2019-12-07 10:05:29 +01:00
KennyTV	decb20d2d1	Convert biome data to 1.15 format	2019-12-07 10:02:11 +01:00
Gerrygames	a68fca9dda	1.15-pre5	2019-12-05 15:03:45 +01:00
Gerrygames	762151f067	1.15-rep4	2019-12-03 14:22:54 +01:00
KennyTV	2c95229cfc	Fix blaze remap and entity destroy in 1.15 ... Fixes #1542	2019-11-30 19:22:36 +01:00
KennyTV	5c7520f552	1.15-pre3	2019-11-28 20:10:19 +01:00
creeper123123321	875d2392b5	Fix position shifting, fix two layers of item copy	2019-11-27 16:39:06 -03:00
KennyTV	a68eac7cd2	Add set cooldown register in ItemRewriter	2019-11-27 12:56:20 +01:00
KennyTV	42efec6e2b	Add version to entity type warning	2019-11-27 00:55:33 +01:00
KennyTV	bcb953a45a	Fix 1.15 chunk read	2019-11-27 00:08:28 +01:00
KennyTV	bca5b43a2a	Fix entity type	2019-11-26 23:59:23 +01:00
KennyTV	da704539f0	Rename suppress-warning config option	2019-11-26 20:14:56 +01:00
KennyTV	bd9a1dda88	Fix last config issues	2019-11-26 18:22:33 +01:00
KennyTV	915258169e	Fix inverted array read check	2019-11-26 13:51:37 +01:00
KennyTV	1b207251e8	Add extra mappings constructor for VB	2019-11-25 22:41:59 +01:00
KennyTV	48feee2bfc	Destroy 1.15 entities	2019-11-25 20:40:03 +01:00
KennyTV	08e145f831	1.15-pre2	2019-11-25 19:37:02 +01:00
KennyTV	21cad97f3f	Some fixes, move blockconnection method to bukkit config	2019-11-25 18:34:55 +01:00
creeper123123321	1e8d04a07d	remove deprecated methods and constructor on item and position, inline some uses of position	2019-11-24 17:55:46 -03:00
creeper123123321	a8a33a3a2b	add exception for wrong protocol	2019-11-24 09:04:37 -03:00
Gerrygames	c478492227	fix missing boss bar packet remap	2019-11-24 11:52:04 +01:00
creeper123123321	beed8437a4	merge dev	2019-11-23 07:23:20 -03:00
KennyTV	501adc503c	Fix typo in simulatePlayerTick getter	2019-11-22 22:39:34 +01:00
KennyTV	907516eb71	Hold config values in fields	2019-11-22 22:00:41 +01:00
creeper123123321	9308fc7712	Fix wrong casting	2019-11-22 15:19:25 -03:00
creeper123123321	062d3759be	Use primitive types in Position and BlockFace, remove world block connections on Sponge, clean code in 1.8 entity tracker, add constructor for cloning Item and Position	2019-11-22 15:13:41 -03:00
Gerrygames	582e4a11d4	1.15 pre1	2019-11-21 18:34:29 +01:00
Myles	285744a274	Merge pull request #1520 from creeper123123321/dev ... 19w46b	2019-11-20 12:59:16 +00:00
Myles	ed5702188c	Merge pull request #1515 from ForceUpdate1/dev_particle_type ... Fix area effect cloud	2019-11-20 12:12:43 +00:00
creeper123123321	f9165a1b64	fixed mappings	2019-11-15 12:30:47 -03:00
creeper123123321	bd0ce3dd71	merge dev	2019-11-15 11:35:35 -03:00
creeper123123321	385a483a29	19w46b	2019-11-15 11:19:31 -03:00
Marco Neuhaus	3b97f843cd	relocate classes	2019-11-13 22:28:23 +01:00
Gerrygames	c3fa950a9f	19w46a	2019-11-13 17:27:51 +01:00
Marco Neuhaus	000313ee9a	move particle type	2019-11-11 12:29:51 +01:00
Marco	dc54551d0c	fix area effect cloud ... add 1.14 particle type	2019-11-10 16:38:12 +01:00
KennyTV	b3dc05e5ce	19w45b	2019-11-08 14:26:20 +01:00
Gerrygames	d16a760466	19w45a	2019-11-07 18:42:05 +01:00
creeper123123321	3761ebf8c7	Pot handler rewrite	2019-11-04 17:36:16 -03:00
Myles	a7d78f7f69	Merge pull request #1503 from creeper123123321/abstraction-update ... Abstraction update	2019-11-02 14:28:58 +00:00
creeper123123321	1735f48f23	primitive array types	2019-11-02 10:00:27 -03:00
creeper123123321	ce4ae73f55	forgotten merge conflict	2019-10-30 14:30:36 -03:00
creeper123123321	fd065fb7c5	merge dev	2019-10-30 14:24:22 -03:00
Myles	5ad2511e17	Merge pull request #1502 from ViaVersion/master ... Merge master into dev	2019-10-30 16:59:47 +00:00
Gerrygames	12279731ad	19w44a	2019-10-30 17:14:00 +01:00
Myles	a8d0a4dd14	Merge pull request #1491 from creeper123123321/abstraction ... deduplicate minecraft compact array code/decode	2019-10-24 21:49:31 +01:00
KennyTV	3257c79e69	Major version bump to 3.0.0-SNAPSHOT	2019-10-24 21:58:22 +02:00
MrMicky	ee54e153bf	Fix item hover event for 1.12 players	2019-10-23 16:11:14 +02:00
creeper123123321	9ea6c34543	use setflatblock	2019-10-19 15:35:34 -03:00
creeper123123321	005c91eb4d	deduplicate minecraft compact array code/decode	2019-10-19 15:31:50 -03:00
Gerrygames	bd805bfdc4	19w42a	2019-10-16 18:07:58 +02:00
Gerrygames	3ffc55b539	19w41a	2019-10-09 18:06:37 +02:00
MrMicky	96c58e7b1c	Fix scoreboard colors on 1.13	2019-10-08 13:25:37 +02:00
KennyTV	c8171b3f43	Item rewriter cleanup	2019-10-05 09:17:10 +02:00
KennyTV	626eb14960	Fix an error in the player spawn packet	2019-10-04 13:26:51 +02:00
KennyTV	c131672870	Fix	2019-10-03 11:00:55 +02:00
KennyTV	a9c49d948a	Merge remote-tracking branch 'upstream/master' into dev ... # Conflicts: # bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java # bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java # common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java # common/src/main/resources/assets/viaversion/config.yml # sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java # velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java	2019-10-02 16:21:37 +02:00
KennyTV	79a2304728	19w40a	2019-10-02 16:19:56 +02:00
KennyTV	48edd01461	Readd second cancelOutgoing method for VB	2019-10-02 15:55:59 +02:00