884 Commits

Author SHA1 Message Date
Dylan K. Taylor
a55ab54ddb Merge branch 'release/3.3' 2018-09-20 19:02:48 +01:00
Dylan K. Taylor
8db1ccc1ae Merge branch 'release/3.1' into release/3.2 2018-09-20 19:02:09 +01:00
Dylan K. Taylor
5d56030afa Item: make nbtDeserialize() return AIR when reading an unknown PC item
This is scummy, but it's better than crashing the whole server just because a chest contained an unknown item.
2018-09-20 19:00:44 +01:00
Dylan K. Taylor
9b4d82630b BlockFactory: remove $solid
this is premature optimization and will run into problems once we enter the flattening.
2018-09-20 16:26:15 +01:00
Dylan K. Taylor
caca097300 Merge branch 'release/3.3' 2018-09-19 16:18:53 +01:00
Dylan K. Taylor
a0bb747d6d Merge branch 'release/3.1' into release/3.2 2018-09-19 16:16:18 +01:00
Dylan K. Taylor
4bc0d850b1 Added Block->getRuntimeId(), clean up some mess 2018-09-19 16:16:10 +01:00
Dylan K. Taylor
8ad57f7ca0 Painting: use Facing::rotate() 2018-09-13 19:36:03 +01:00
Dylan K. Taylor
0d152a2139 Merge branch 'release/3.3' 2018-09-08 14:30:16 +01:00
Dylan K. Taylor
5af4dd20df Merge branch 'release/3.1' into release/3.2 2018-09-08 14:25:11 +01:00
Dylan K. Taylor
c7d58db7eb Cleanup Entity age handling, fixed arrows despawning too quickly after long flight 2018-09-08 14:23:06 +01:00
Dylan K. Taylor
f218868338 Separate facing/bearing handling from Vector3, deobfusticate a ton of @shoghicp old code 2018-09-05 19:56:14 +01:00
Dylan K. Taylor
3b62926721 Merge branch 'release/3.2' 2018-08-25 18:37:27 +01:00
Dylan K. Taylor
032b20f659 Server: remove premature optimization of findEntity() 2018-08-25 18:37:18 +01:00
Dylan K. Taylor
4fb1f8dd76 Merge branch 'release/3.2' 2018-08-25 17:49:28 +01:00
Dylan K. Taylor
bea634a9b7
Change air tank regeneration to match UA (#2396) 2018-08-22 19:10:53 +01:00
Dylan K. Taylor
286e062086 Merge branch 'release/3.2' 2018-08-22 15:42:00 +01:00
Dylan K. Taylor
8daf3dc8b4 Merge branch 'release/3.1' into release/3.2 2018-08-22 15:41:52 +01:00
Dylan K. Taylor
4cc7573a64 Merge branch 'release/3.0' into release/3.1 2018-08-22 15:40:43 +01:00
Dylan K. Taylor
9d80802e53 Living: fixed some update conditions not being set 2018-08-22 15:40:32 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
92aeab0d00 Merge branch 'release/3.2' 2018-08-19 16:03:04 +01:00
Dylan K. Taylor
2eda8cfad3 Merge branch 'release/3.1' into release/3.2 2018-08-19 16:01:47 +01:00
Dylan K. Taylor
91be5aba0c Merge branch 'release/3.0' into release/3.1 2018-08-19 16:00:25 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
a306421737 Entity: remove lastX lastY lastZ lastYaw lastPitch, replace with lastLocation object field 2018-08-18 13:38:19 +01:00
Dylan K. Taylor
44daf57fbb Merge branch 'release/3.2' 2018-08-17 19:48:18 +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
718ca40379 Merge branch 'release/3.2' 2018-08-16 15:52:25 +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
2ee0436f46 Continued cleanup of runtime entity NBT removal
it's no longer necessary to force-write these, since the NBT is now ephemeral. Any tag type mismatches should be dealt with on read, after which the original tag will be discarded anyway.
2018-08-15 14:50:58 +01:00
Dylan K. Taylor
0ae9b41062 Merge branch 'release/3.2' 2018-08-14 15:03:37 +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
0273e2484e
Kill entity runtime NBT (#2361) 2018-08-14 13:33:02 +01:00
Dylan K. Taylor
82bd6c5b34 Merge branch 'release/3.2' 2018-08-07 19:06:46 +01:00
Dylan K. Taylor
cf29ab1f17 Arrow: remove unused import 2018-08-07 19:06:40 +01:00
Dylan K. Taylor
d3fa8e0a0a Merge branch 'release/3.2' 2018-08-07 18:49:21 +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
202fb08792 Merge branch 'release/3.2' 2018-08-07 14:39:56 +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
4597899ac3 Merge branch 'release/3.2' 2018-08-06 21:34:07 +01:00
max
f3b2bcfd13 Added Conduit Power effect 2018-08-06 21:30:15 +01:00