4cc7573a64
Merge branch 'release/3.0' into release/3.1
2018-08-22 15:40:43 +01:00
9d80802e53
Living: fixed some update conditions not being set
2018-08-22 15:40:32 +01:00
ec1e257e21
Entity: Fixed fire damage not taking effect in the void
...
this is an absurd bug that nobody would ever otherwise notice, but the problem is that the doOnFireTick() call isn't evaluated if hasUpdate is already true.
2018-08-22 15:36:31 +01:00
6fce2b3349
Merge branch 'release/3.0' into release/3.1
2018-08-19 19:52:30 +01:00
64ed8adefc
Cactus: fixed place/break logic mismatch causing item spewing
2018-08-19 19:52:07 +01:00
91be5aba0c
Merge branch 'release/3.0' into release/3.1
2018-08-19 16:00:25 +01:00
5df601c817
Add @see docs so PhpStorm can see dynamic constructor usages
...
PhpStorm can't see constructor usages when the class name is dynamic. This causes maintenance problems because cross-referencing constructors called like this doesn't show up dynamic calls.
2018-08-19 16:00:15 +01:00
1a47735d84
Merge branch 'release/3.0' into release/3.1
2018-08-19 13:59:34 +01:00
0cdf4d0c55
Spoon the TesterPlugin into the main repository
...
I am eating my own words this once, because having the tester plugin as a separate repository makes no sense - it is just added barriers to writing proper tests with no actual benefit. Since the tester plugin is specifically intended for CI, it doesn't make sense for it to be in its own module.
2018-08-19 13:58:13 +01:00
e6e28b74b5
Nuke the TesterPlugin submodule
2018-08-19 13:47:43 +01:00
72f46b4631
Merge branch 'release/3.0' into release/3.1
2018-08-19 11:22:51 +01:00
3892f2f404
Config: Properly prevent keys getting transformed into bools
...
The original regex almost completely failed at its objective, because it a) only worked if there was no value for the key, and b) did not prevent all such occurrences getting transformed, while quoting patterns that would not get transformed anyway.
2018-08-19 11:22:36 +01:00
4a1d67cb91
Merge branch 'release/3.0' into release/3.1
2018-08-17 19:47:34 +01:00
b4694092b7
Painting: fix motive not being saved
2018-08-17 19:47:26 +01:00
d99ee515c6
3.1.5 is next
2018-08-16 18:33:27 +01:00
17f7dc34be
Release 3.1.4
2018-08-16 18:26:49 +01:00
a63d66c048
Sync 3.1 and 3.0 branches
2018-08-16 18:26:26 +01:00
95f6995ae0
3.0.12 is next
2018-08-16 18:25:31 +01:00
4a24d7909e
Release 3.0.11
2018-08-16 18:14:04 +01:00
4e2387edc1
Merge branch 'release/3.0' into release/3.1
2018-08-16 15:52:12 +01:00
a5e38576ef
ItemEntity: fixed using -1 for infinite pickup delay not working
...
closes #2382 (squash-merge)
2018-08-16 15:52:05 +01:00
381151dedc
Merge branch 'release/3.0' into release/3.1
2018-08-15 13:48:36 +01:00
a604e6835e
CoalOre: fixed ignoring silk touch for XP drops, closes #2374
2018-08-15 13:48:29 +01:00
142a6d7678
Merge branch 'release/3.0' into release/3.1
2018-08-14 15:03:22 +01:00
b2ca364de0
SplashPotion: Don't apply effects to entities which are not alive
...
fixes #2372
2018-08-14 15:03:15 +01:00
09ed40a921
Merge branch 'release/3.0' into release/3.1
2018-08-13 13:22:32 +01:00
565373cee6
OfflinePlayer: remove unnecessary getName() usages
2018-08-13 13:22:00 +01:00
c29723e3c4
OfflinePlayer: remove unnecessary strtolower() calls
...
closes #2371
2018-08-13 13:18:58 +01:00
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
974583a853
Merge branch 'release/3.0' into release/3.1
2018-08-11 19:37:10 +01:00
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
699f35cc05
Merge branch 'release/3.0' into release/3.1
2018-08-07 18:49:06 +01:00
8fa196efc9
FallingBlock: fixed state not being saved
2018-08-07 18:48:52 +01:00
b1ab881b99
Merge branch 'release/3.0' into release/3.1
2018-08-07 14:32:28 +01:00
69c54e789a
Clear the title bar when the server shutdown.
2018-08-07 14:31:39 +01:00
e33d1279fa
Merge branch 'release/3.0' into release/3.1
2018-08-06 18:45:01 +01:00
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
6a05edb4e9
Merge branch 'release/3.0' into release/3.1
2018-08-05 11:33:02 +01:00
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
46bd096f06
3.1.4 is next
2018-08-04 16:46:51 +01:00
51a8905fb3
Release 3.1.3
2018-08-04 16:41:16 +01:00
f954d7c3dc
Bring 3.1 up to speed with 3.0
2018-08-04 16:40:40 +01:00
7ad0aa56b1
3.0.11 is next
2018-08-04 16:39:53 +01:00
1ff6f8846e
disable dev flag
2018-08-04 16:30:23 +01:00
e6f53cc56b
Merge branch 'release/3.0' into release/3.1
2018-08-03 20:07:46 +01:00
87f458f9bd
AsyncPool: remove now-unnecessary isTerminated() call
2018-08-03 20:07:37 +01:00
5a7e575c3a
AsyncPool: isCrashed() now returns true when a fatal error occurred
...
the fix for chunks earlier didn't fix...
2018-08-03 20:06:41 +01:00
20b37d0208
Merge branch 'release/3.0' into release/3.1
2018-08-03 18:50:14 +01:00
d6d98183ea
MainLogger: Log messages and exception traces in a synchronized block
...
this ensures that stack traces are emitted coherently without messages from other threads landing in the middle.
2018-08-03 18:50:06 +01:00
89cf76363f
Merge branch 'release/3.0' into release/3.1
2018-08-03 18:24:36 +01:00
