7676 Commits

Author SHA1 Message Date
Dylan K. Taylor
caca097300 Merge branch 'release/3.3' 2018-09-19 16:18:53 +01:00
Dylan K. Taylor
5e94d20d79 Merge branch 'release/3.2' into release/3.3 2018-09-19 16:17:00 +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
dbe0ee2d44 BlockFactory: don't pre-populate gaps with UnknownBlock objects
this produces a minor reduction in memory usage.
2018-09-19 15:17:39 +01:00
Dylan K. Taylor
ef038d9625 Level: use block directly in updateBlockSkyLight() 2018-09-19 15:07:24 +01:00
Dylan K. Taylor
48a5eeb3a4 BlockFactory: remove some useless static arrays 2018-09-19 15:06:58 +01:00
Dylan K. Taylor
a80d5bb6a8 Leaf log search is type agnostic
any wood type will do
2018-09-19 08:47:40 +01:00
Dylan K. Taylor
01f12d6147 Merge branch 'release/3.3' 2018-09-18 12:32:12 +01:00
Dylan K. Taylor
ad9df6764d Merge branch 'release/3.2' into release/3.3 2018-09-18 12:32:07 +01:00
Dylan K. Taylor
97583c8b04 Merge branch 'release/3.1' into release/3.2 2018-09-18 12:32:01 +01:00
Dylan K. Taylor
107192c753 Bed: fixed block-pick giving wrong colour items 2018-09-18 12:31:53 +01:00
Dylan K. Taylor
c721503b7a Merge branch 'release/3.3' 2018-09-18 12:22:32 +01:00
Dylan K. Taylor
6309a242dc Merge branch 'release/3.2' into release/3.3 2018-09-18 12:22:26 +01:00
Dylan K. Taylor
870f9abc20 Merge branch 'release/3.1' into release/3.2 2018-09-18 12:22:20 +01:00
Dylan K. Taylor
0e2bbc44db Fixed drops and item picking of Brewing Stand 2018-09-18 12:22:12 +01:00
Dylan K. Taylor
31e4093882 Remove some remaining hardcoded meta maps 2018-09-16 18:00:16 +01:00
Dylan K. Taylor
8aab51c532 Merge branch 'release/3.3' 2018-09-16 17:47:41 +01:00
Dylan K. Taylor
e58d015f14 Merge branch 'release/3.2' into release/3.3 2018-09-16 17:47:08 +01:00
Dylan K. Taylor
d9768abe47 Merge branch 'release/3.1' into release/3.2 2018-09-16 17:47:01 +01:00
Dylan K. Taylor
e9b84ecc8b Fixed incorrect break check for torch 2018-09-16 17:46:50 +01:00
Dylan K. Taylor
1bb4daa7d1 Fixed mess of rotations being inverted 2018-09-16 17:37:36 +01:00
Dylan K. Taylor
f7f06c993d Make block constructors not write to this->meta directly 2018-09-16 14:10:40 +01:00
Dylan K. Taylor
ed8b8a13a3 Vine: cleanup BB calculation 2018-09-16 12:20:10 +01:00
Dylan K. Taylor
54e19a6d2f Vine: fixed north check being missing 2018-09-15 17:10:57 +01:00
Dylan K. Taylor
932705e114 Merge branch 'release/3.3' 2018-09-14 17:10:39 +01:00
Dylan K. Taylor
0d65f9c4b8 Merge branch 'release/3.2' into release/3.3 2018-09-14 17:09:51 +01:00
Dylan K. Taylor
c83d12790e Merge branch 'release/3.1' into release/3.2 2018-09-14 17:09:41 +01:00
Dylan K. Taylor
5863d4c066 Fixed PermissibleBase->clearPermissions() not unsubscribing from permissions that aren't explicitly assigned
This came to light after observing cfb6856634f91930f6e013e7b98edb638dea15d9 in a fresh light. I noticed that this fix should not have been necessary because clearPermissions() should have dealt with it. Unfortunately, permissions can be set without being set in PermissibleBase->permissions, so this misses things.
2018-09-14 17:06:32 +01:00
Dylan K. Taylor
0e5cbca983 PlayerInteractEvent: cleanup constructor now that block isn't optional anymore 2018-09-14 16:30:22 +01:00
Dylan K. Taylor
db2567f965 Separate use-item action from PlayerInteractEvent
This solves the age-old issue of PlayerInteractEvent firing twice when a player clicks a block with an item in the hand.

API changes:
- Removed PlayerInteractEvent constants LEFT_CLICK_AIR, RIGHT_CLICK_AIR and PHYSICAL.
- PlayerInteractEvent no longer fires when the player right-clicks the air.
- Added new event PlayerItemUseEvent.
2018-09-14 16:24:29 +01:00
Dylan K. Taylor
b660bcdb65 Merge branch 'release/3.3' 2018-09-14 16:20:22 +01:00
Dylan K. Taylor
22077c1fdd Merge branch 'release/3.2' into release/3.3 2018-09-14 16:18:19 +01:00
Dylan K. Taylor
7d54d18732 Merge branch 'release/3.1' into release/3.2 2018-09-14 16:18:12 +01:00
Dylan K. Taylor
bfbc845efa Remove impossible uses of PlayerInteractEvent CLICK_AIR constants 2018-09-14 16:17:55 +01:00
Dylan K. Taylor
1f3c0524d9 Merge branch 'release/3.3' 2018-09-14 11:06:31 +01:00
Dylan K. Taylor
f33c19e77a Merge branch 'release/3.2' into release/3.3 2018-09-14 11:06:24 +01:00
Dylan K. Taylor
2ff4228fb7 Merge branch 'release/3.1' into release/3.2 2018-09-14 11:06:11 +01:00
Dylan K. Taylor
06c4f31db7 Server: Account for later levels being unloaded by earlier levels' ticking function in checkTickUpdates()
should fix #2434

This happens when a plugin causes a level to be unloaded during an event fired on level tick.
2018-09-14 11:05:51 +01:00
Dylan K. Taylor
d4580fa683 Cleanup Sugarcane placement code 2018-09-13 19:49:55 +01:00
Dylan K. Taylor
8ad57f7ca0 Painting: use Facing::rotate() 2018-09-13 19:36:03 +01:00
Dylan K. Taylor
2b8405e6ee Make use of Bearing::opposite() 2018-09-13 19:35:47 +01:00
Dylan K. Taylor
f488e594f6 Remove hardcoded facing literals in for loops 2018-09-13 19:34:27 +01:00
Dylan K. Taylor
65684eec99 Door: fixed bad rotation when no player is specified 2018-09-13 18:36:50 +01:00
Dylan K. Taylor
0406c49ba9 Leaves: improve log search algorithm to fix vanilla inconsistencies 2018-09-13 17:30:23 +01:00
Dylan K. Taylor
3b772f54e9 Leaves: make more findLog() params optional 2018-09-13 16:49:22 +01:00
Dylan K. Taylor
fee42e9f34
Leaves: Replace a big mess of code with something nice and simple (#2432) 2018-09-13 16:36:10 +01:00
Dylan K. Taylor
c0962a47be Block: Use parent::place() instead of setBlock() directly 2018-09-13 12:54:03 +01:00
Dylan K. Taylor
54342ab0ce Remove ridiculous code in Ladder 2018-09-12 19:56:17 +01:00
Dylan K. Taylor
778eb5fb33 Block: Make getId(), getDamage(), setDamage() non-final
In the future, these methods will be used to derive ID/meta on the fly from properties instead of using them internally.
2018-09-12 19:40:19 +01:00