8348 Commits

Author SHA1 Message Date
Dylan K. Taylor
bfa415e108 Add unit tests for json decoding hack 2018-08-19 10:30:52 +01:00
Dylan K. Taylor
b66095cb36
Added a hack for MC W10 JSON empty strings bug (#2383) 2018-08-19 10:10:40 +01:00
Dylan K. Taylor
0336ae8229 Merge branch 'release/3.1' into release/3.2 2018-08-17 19:47:41 +01:00
Dylan K. Taylor
4a1d67cb91 Merge branch 'release/3.0' into release/3.1 2018-08-17 19:47:34 +01:00
Dylan K. Taylor
b4694092b7 Painting: fix motive not being saved 2018-08-17 19:47:26 +01:00
Dylan K. Taylor
4b3e17e681 Sync 3.2 and 3.1 branches 2018-08-16 18:33:54 +01:00
Dylan K. Taylor
d99ee515c6 3.1.5 is next 2018-08-16 18:33:27 +01:00
Dylan K. Taylor
17f7dc34be Release 3.1.4 3.1.4 2018-08-16 18:26:49 +01:00
Dylan K. Taylor
a63d66c048 Sync 3.1 and 3.0 branches 2018-08-16 18:26:26 +01:00
Dylan K. Taylor
95f6995ae0 3.0.12 is next 2018-08-16 18:25:31 +01:00
Dylan K. Taylor
4a24d7909e Release 3.0.11 3.0.11 2018-08-16 18:14:04 +01:00
Dylan K. Taylor
5424644ca1 Merge branch 'release/3.1' into release/3.2 2018-08-16 15:52:19 +01:00
Dylan K. Taylor
4e2387edc1 Merge branch 'release/3.0' into release/3.1 2018-08-16 15:52:12 +01:00
Frago9876543210
a5e38576ef ItemEntity: fixed using -1 for infinite pickup delay not working
closes #2382 (squash-merge)
2018-08-16 15:52:05 +01:00
Dylan K. Taylor
aa7c4bc64d Merge branch 'release/3.1' into release/3.2 2018-08-15 13:48:46 +01:00
Dylan K. Taylor
381151dedc Merge branch 'release/3.0' into release/3.1 2018-08-15 13:48:36 +01:00
Dylan K. Taylor
a604e6835e CoalOre: fixed ignoring silk touch for XP drops, closes #2374 2018-08-15 13:48:29 +01:00
Dylan K. Taylor
df8e10cad9 Forms API, part 1: add Player->sendForm() and Form interface
There's no implementation here yet, but that can come later. This lays the ground for allowing plugins to have an integrated method to send forms, as well as a solution to the ID conflict problem.

A built in implementation should not be a concretion and it should be able to be swapped for third party implementations. This enables the possiblity to do so.
2018-08-14 16:06:55 +01:00
Dylan K. Taylor
d98a6e566c Merge branch 'release/3.1' into release/3.2 2018-08-14 15:03:30 +01:00
Dylan K. Taylor
142a6d7678 Merge branch 'release/3.0' into release/3.1 2018-08-14 15:03:22 +01:00
Dylan K. Taylor
b2ca364de0 SplashPotion: Don't apply effects to entities which are not alive
fixes #2372
2018-08-14 15:03:15 +01:00
Dylan K. Taylor
ade2be9eee Merge branch 'release/3.1' into release/3.2 2018-08-13 13:22:40 +01:00
Dylan K. Taylor
09ed40a921 Merge branch 'release/3.0' into release/3.1 2018-08-13 13:22:32 +01:00
Dylan K. Taylor
565373cee6 OfflinePlayer: remove unnecessary getName() usages 2018-08-13 13:22:00 +01:00
Dylan K. Taylor
c29723e3c4 OfflinePlayer: remove unnecessary strtolower() calls
closes #2371
2018-08-13 13:18:58 +01:00
Dylan K. Taylor
39ed6a7cdf Merge branch 'release/3.1' into release/3.2 2018-08-11 19:59:53 +01:00
Dylan K. Taylor
a8811ab2b3 Fixed 1.5.0 PlayerSkinPacket protocol change that somehow disappeared
I am 100% sure I committed this change, but it isn't in the merge...
2018-08-11 19:59:44 +01:00
Dylan K. Taylor
bec5aaa54b Merge branch 'release/3.1' into release/3.2 2018-08-11 19:37:18 +01:00
Dylan K. Taylor
974583a853 Merge branch 'release/3.0' into release/3.1 2018-08-11 19:37:10 +01:00
Dylan K. Taylor
03f8fe62d4 Fixed structure of GuiDataPickItemPacket
this changed in 1.2.0.7 beta and I didn't spot it.
2018-08-11 19:36:53 +01:00
Dylan K. Taylor
cf29ab1f17 Arrow: remove unused import 2018-08-07 19:06:40 +01:00
Dylan K. Taylor
c5c5a53a13 Merge branch 'release/3.1' into release/3.2 2018-08-07 18:49:13 +01:00
Dylan K. Taylor
699f35cc05 Merge branch 'release/3.0' into release/3.1 2018-08-07 18:49:06 +01:00
Dylan K. Taylor
8fa196efc9 FallingBlock: fixed state not being saved 2018-08-07 18:48:52 +01:00
Dylan K. Taylor
63a65680ac typo 2018-08-07 14:43:29 +01:00
왕고슴도치
47cd6fe105 EntityDamageEvent: Add API to customize Living entity attack cooldown time
closes #2310
2018-08-07 14:39:26 +01:00
Dylan K. Taylor
f582b5a3db Merge branch 'release/3.1' into release/3.2 2018-08-07 14:32:38 +01:00
Dylan K. Taylor
b1ab881b99 Merge branch 'release/3.0' into release/3.1 2018-08-07 14:32:28 +01:00
Fris
69c54e789a Clear the title bar when the server shutdown. 2018-08-07 14:31:39 +01:00
Dylan K. Taylor
7f0fa2ac3d
PluginBase: Do not fill defaults from resources/config.yml (#2316)
This fixes #2219.
2018-08-07 12:33:24 +01:00
max
f3b2bcfd13 Added Conduit Power effect 2018-08-06 21:30:15 +01:00
Dylan K. Taylor
c947909c2e Updated language submodule 2018-08-06 20:52:53 +01:00
Dylan K. Taylor
09dadc72bc Merge branch 'release/3.1' into release/3.2 2018-08-06 18:45:08 +01:00
Dylan K. Taylor
e33d1279fa Merge branch 'release/3.0' into release/3.1 2018-08-06 18:45:01 +01:00
Dylan K. Taylor
9e1fa453ad Level: Fixed leak of global packets when no players are online
If a global packet was broadcasted when no players were online, it would be held in memory indefinitely (until a player joined).
2018-08-06 18:44:53 +01:00
Dylan K. Taylor
ca541032ae Move Player death message derivation to PlayerDeathEvent static method
This now no longer requires a Player to operate, only a player name.
2018-08-05 12:19:16 +01:00
Dylan K. Taylor
bcf9915082 Merge branch 'release/3.1' into release/3.2 2018-08-05 11:33:11 +01:00
Dylan K. Taylor
6a05edb4e9 Merge branch 'release/3.0' into release/3.1 2018-08-05 11:33:02 +01:00
Dylan K. Taylor
70635d0870 DropItemAction: Consider invalid if the target item is null
it's not possible to drop a null item.
2018-08-05 11:32:50 +01:00
Dylan K. Taylor
8d6dc4e188 Merge branch 'release/3.1' into release/3.2 2018-08-04 16:47:26 +01:00