Commit Graph

1611 Commits

Author SHA1 Message Date
Myles
c9dab5402e
Merge pull request #923 from creeper123123321/master
Named sound effect rewriting + Effect rewriting
2018-07-29 12:59:01 +01:00
creeper123123321
e5169378fc
Revert "Replace Unpooled.buffer()"
This reverts commit e9159cb
2018-07-29 08:56:26 -03:00
creeper123123321
ca23750c28
merge upstream^2 + lowercase sound ids 2018-07-29 08:31:48 -03:00
creeper123123321
446fd84035
merge upstream 2018-07-29 08:30:58 -03:00
Myles
fc264d0b0f Cleanup various debug code 2018-07-29 12:14:17 +01:00
Myles
e9ad372039 Remap negative ids to air (workaround for #933) 2018-07-29 11:48:38 +01:00
creeper123123321
b1e8efb00b
Fix memory leak 2018-07-28 17:53:17 -03:00
creeper123123321
73ee2498e8
More optimization 2018-07-25 18:12:38 -03:00
creeper123123321
6608877ef0
Rewrite palette instead of rewriting each block 2018-07-25 18:03:25 -03:00
creeper123123321
e9159cb2de
Replace Unpooled.buffer() 2018-07-25 09:04:06 -03:00
creeper123123321
a403c7424c
*facepalm* 2018-07-24 10:55:08 -03:00
creeper123123321
de2abdcab0
*facepalm* 2018-07-23 10:20:41 -03:00
creeper123123321
088ce93701
Use short[] for sound remapping 2018-07-23 10:15:55 -03:00
creeper123123321
b5a7c92c8d
Add missing .toClient 2018-07-22 19:11:29 -03:00
creeper123123321
d4144264d5
Use short[] for block mappings 2018-07-22 19:03:22 -03:00
creeper123123321
b221530276
Update Protocol1_13To1_12_2.java 2018-07-22 18:02:17 -03:00
creeper123123321
8476c83d62
Merge branch 'master' into master 2018-07-22 18:01:04 -03:00
Matsv
9d624bc822 Reimplement advancements by rewriting the items to flat items 2018-07-22 22:58:18 +02:00
creeper123123321
f15c841b99
Hacky fix to noteblock 2018-07-22 17:51:18 -03:00
creeper123123321
019bccd24a
Rewrite advancements 2018-07-22 17:06:43 -03:00
creeper123123321
584c0709e8
Block data 2018-07-22 16:24:38 -03:00
creeper123123321
d577088b8c
Named sound effect rewriting + Effect rewriting (thanks @Pokechu22) 2018-07-22 15:15:40 -03:00
Mats
72f5d8addc
Merge pull request #910 from creeper123123321/master
Fix bungee-chat italic, bold, obfuscated, underline, strikethrough
2018-07-22 03:24:51 +02:00
Mats
6d959169fa
Merge pull request #914 from Pokechu22/wdl-channels
Remap WDL plugin channels
2018-07-22 03:23:33 +02:00
Mats
076d05c103
Merge pull request #911 from McPiraci/master
Fix rewriting of MC|StopSound plugin channel.
2018-07-22 03:22:55 +02:00
Pokechu22
1e91b21537 Remap WDL plugin channels 2018-07-21 14:18:49 -07:00
Michał Kasprzyk
b64a0b065c Fix MC|StopSound plugin channel rewriting.
(ID of stop sound packet is 0x4C, not 0x4B)
2018-07-21 17:32:30 +02:00
creeper123123321
faf7e5d25f
Fix bungee-chat italic, bold, obfuscated, underline, strikethrough 2018-07-21 11:48:31 -03:00
Mats
fd37c6b040
Merge pull request #902 from Gerrygames/master
Fix reddust particle color for 1.13 clients
2018-07-21 12:45:02 +02:00
Gerrygames
bb4b5d3080 Fix reddust particle color for 1.13 clients 2018-07-21 11:18:14 +02:00
Mats
d27f17f74b
Merge pull request #900 from Dinnerwolph/master
fix server icon
2018-07-21 02:58:46 +02:00
dinnerwolph
3646fad197 fix server icon 2018-07-21 02:51:07 +02:00
Myles
34491967e2 Back to snapshot 2018-07-20 23:29:25 +01:00
Myles
3df70055b0 1.4.1 release 2018-07-20 23:25:57 +01:00
Myles
7c0c4ee74d Implement prefix based team colours (based on code by @JollyAjax) 2018-07-20 21:21:24 +01:00
Myles
ca415cc719
Merge pull request #896 from creeper123123321/master
Support custom enchantments
2018-07-20 20:02:38 +01:00
creeper123123321
6c17615ecb
Accept int tag in level 2018-07-20 15:58:04 -03:00
creeper123123321
9a1376dcb3
Accept int tag 2018-07-20 15:54:52 -03:00
creeper123123321
32161333dd
Fix custom enchantments 2018-07-20 15:47:05 -03:00
Myles
a2f5120069
Merge pull request #894 from creeper123123321/memory-efficiency
Memory efficiency
2018-07-20 18:47:39 +01:00
creeper123123321
e067492cca
Catch exception 2018-07-20 13:23:40 -03:00
creeper123123321
1cdf2ed1ef
Make compatible with older netty 2018-07-20 13:16:34 -03:00
creeper123123321
dc90652853
Memory efficiency 2018-07-20 13:16:33 -03:00
Myles
459de30e9a
Merge pull request #892 from Logics4/master
Don't use Paper block placement patch in 1.12.
2018-07-20 16:23:11 +01:00
Logics4
4fe68c2c93 Don't use Paper block placement patch in 1.12.
Apparently the bug that caused the block placement issues with Paper was fixed in 1.12 (according to Aikar from its development team). So, with this commit the patch to fix it won't run if the server is running Paper 1.12 or higher (which means it will only be used in 1.11.2 and lower server versions).
2018-07-20 16:12:00 +01:00
Myles
8b0eb9c9d0
Merge pull request #890 from creeper123123321/master
Remove redundant tags
2018-07-20 15:13:44 +01:00
creeper123123321
a2fce6f4a5
Update WorldPackets.java 2018-07-20 10:29:51 -03:00
creeper123123321
78b9e5d833
Fix biomes 2018-07-20 10:26:56 -03:00
creeper123123321
4e2156bd2b
Remove redundant tags 2018-07-20 07:14:51 -03:00
Matsv
fdc4d2c5d2 Merge remote-tracking branch 'upstream/master' into upmaster 2018-07-20 11:16:00 +02:00