SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität
6.710 Commits 2 Branches 0 Tags 344 MiB
905e5cdc31
Commit graph

908 Commits

Autor SHA1 Nachricht Datum
Shane Freeder
729db1bed4 Rebuild patches 
Cos, you know, pushing the correct changes the first time woulda been
overrated
 2022-02-01 13:06:41 +00:00
Shane Freeder
f3497a0c5c Updated Upstream (Bukkit/CraftBukkit) 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
5c21a63f PR-717: Add PlayerHideEntityEvent and PlayerShowEntityEvent

CraftBukkit Changes:
c26a7b54d PR-1000: Add PlayerHideEntityEvent and PlayerShowEntityEvent
 2022-02-01 11:35:36 +00:00
Shane Freeder
295a45f95d Use a CHM for StructureTemplate.Pallete cache 
fixes a CME due to this collection being shared across threads

This patch was in 1.16.5 for a good while and noticed somebody
getting impacted by the same thing
 2022-02-01 09:47:46 +00:00
Jason Penilla
9b4136a8b5 [ci skip] Fix param mismatch from last commit 2022-01-25 20:53:18 -07:00
Jason Penilla
2c861d2ae1 [ci skip] Update parameter mappings 2022-01-25 20:43:53 -07:00
Jake Potrebic
51cd82371b Add STRUCTURE_TYPE registry entry (#6400) 2022-01-23 11:12:42 -08:00
Jake Potrebic
0c5c3e2248 More PotionEffectType API (#5737) 2022-01-23 10:42:38 -08:00
Jake Potrebic
68325f5385 Add configurable stronghold seed (#7334) 2022-01-23 06:26:22 -08:00
Owen1212055
a41671b4d9 Dolphin API (#7102) 2022-01-23 08:55:11 -05:00
Owen1212055
bd913382ae Lock Frozen Ticks API (#7207) 2022-01-23 08:35:07 -05:00
MrPowerGamerBR
4e81f50798 [ci skip] Fix multiple ItemStack array nullability mistakes (#7055) 
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 2022-01-22 22:40:57 -03:00
Jake Potrebic
9c9ae4d774 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359) 2022-01-22 16:59:56 -08:00
Kezz
ab498329b2 Fix NotePlayEvent (#5180) 2022-01-22 07:42:10 +00:00
Jake Potrebic
bb4bcf7746 Make tag presets unmodifiable (#7378) 2022-01-21 15:07:35 -08:00
Jan
8d5b76d0f7 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317) 
Co-authored-by: Jan Boerman <janboerman95@gmail.com>
 2022-01-20 20:54:57 +01:00
Brody Beckwith
7e6bb66f2a Add Multi Block Change API (#7333) 2022-01-20 12:50:50 -05:00
Riley Park
44efb397fc Deprecate log4j logger method in Plugin 2022-01-19 18:39:08 -08:00
Noah van der Aa
7b57dbf7c0 Offset spigot item optimizations instead of Mojang's (#6290) 2022-01-19 20:18:24 +01:00
Jake Potrebic
a5b67c2a4a Fix setSpawnedItem from 1.18 update (#7328) 2022-01-18 19:09:04 -08:00
Jake Potrebic
07885d0bec Fix setting unplaced furnace cook speed multiplier (#7327) 2022-01-18 11:33:37 -08:00
Jason Penilla
9b0f4a241c Warn on strange @EventHandler return types (#7372) 2022-01-18 11:47:54 -07:00
Noah van der Aa
5fd56a9336 [ci skip] Fix incorrect javadoc for Mob pathfinding API (#6842) 2022-01-18 08:26:11 +01:00
Nassim Jahnke
642328f521 Push illegal char kick to main thread (#7363) 2022-01-18 08:16:36 +01:00
Jake Potrebic
f794ec37cb Change default for hoppers ignoring occluded blocks (#7342) 2022-01-17 23:11:11 -08:00
HexedHero
a0fb5ba052 Fix Lure infinite loop (#6850) 2022-01-18 06:54:31 +00:00
Camotoy
756c3377ea Add unsupported field to disable username validation (#7350) 
* Add unsupported field to disable username validation

* Add unsupported field to disable username validation
 2022-01-17 22:52:47 -05:00
Owen1212055
affb89f9a2 Expand Panda API (#7061) 2022-01-17 18:23:44 -05:00
Jake Potrebic
48f228173e Fix and deprecate ItemStack#getI18NDisplayName (#7358) 2022-01-16 16:53:26 -08:00
Jake Potrebic
2fcdb1b8ed Fix NPE for bucket empty result stack being null (#7354) 2022-01-16 12:08:24 -08:00
Jake Potrebic
c8208e9482 Fix xp reward for baby zombies (#7353) 2022-01-16 11:15:16 -08:00
PureGero
2c7a063234 Remove redundant getRemoteAddress that can cause an NPE (#7331) 2022-01-14 13:56:45 +10:00
Jake Potrebic
4627ffe255 Some block state hunks were in the wrong patch (#7308) 2022-01-13 11:31:48 -08:00
John
a8a9f84e87 Added getHostname to AsyncPlayerPreLoginEvent (#6656) 2022-01-12 18:21:29 +01:00
Nassim Jahnke
a6ae1cc540 Fix chunk range int overflow 2022-01-11 19:34:25 +01:00
Shane Freeder
68ee3947db Fix defaults for slime-spawn-height in paper config 
do note that if you happened to grab the previous build in the few minutes it
was alive, you'll want to reset your settings here

also, i
 2022-01-11 02:55:05 +00:00
Pedro
a663146adb Add configurable height for slime spawn per world (#6310) 2022-01-10 23:27:16 -03:00
Nassim Jahnke
1a802ea980 Reset placed blocks on exceptions 2022-01-10 14:03:18 +01:00
Tom Miller
5ac09635df Add/Remove multiple entries with Scoreboard Team (#6640) 2022-01-09 23:08:55 -06:00
Jacob Andersen
7c75e3b68a Add material tags for deepslate ores (#7174) 2022-01-09 20:25:22 -08:00
u9g
c5843511ae Add new overload to PersistentDataContainer#has (#7278) 
Co-authored-by: u9g <winworkswow@gmail.com>
Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
 2022-01-09 11:35:45 -05:00
Jake Potrebic
c6f34093f2 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246) 2022-01-08 21:12:05 -08:00
Jason Penilla
bd09b3751c Expose vanilla BiomeProvider from WorldInfo (#7295) 2022-01-07 15:35:32 -08:00
Spottedleaf
9dd2c32156 Merge chunk task urgent executor thread into the worker queue 
By keeping them separate, urgent tasks could not be executed
by the worker queue.
 2022-01-07 15:08:34 -08:00
Spottedleaf
b8de21cf48 Fix incorrect old oversized chunk data merging 
All legacy oversized chunks were created before the new
chunk format, so don't try to merge into the new format.
 2022-01-07 13:49:39 -08:00
Brokkonaut
246a5a3002 Make water animal spawn height configurable (#7135) 2022-01-07 11:38:51 +01:00
Nassim Jahnke
c652a3fafe Don't print utterly useless brig exception 2022-01-06 13:11:08 +01:00
Nassim Jahnke
a3e86aeb04 Catch more json parse errors 2022-01-06 12:40:51 +01:00
Jake Potrebic
2d1c799f5a Fix saving configs with more long comments (#7248) 2022-01-05 11:54:42 -08:00
Nassim Jahnke
82bf2e5436 Fix compile 2022-01-03 10:23:56 +01:00
Nassim Jahnke
13786438fc Fix filtered text not being applied on sign update 
Fixes #7266
 2022-01-03 10:17:27 +01:00
Jake Potrebic
30e83fff8a Fixed FishingHook param mappings being swapped (#7243) 2022-01-02 22:24:33 -08:00
Nassim Jahnke
3ae71b799d Fix disarmed tripwire block updates 
Fixes #7259
Closes #7261
 2022-01-02 21:33:53 +01:00
Jason Penilla
8fd1e9d56b Use AreaMap for per-player mob spawning (#7235) 2022-01-02 11:06:08 -08:00
Pierre Maurice Schwang
a671db9b96 Make BlockData creation thread safe again (#6876) 2022-01-02 18:29:21 +01:00
sean
fc1c86477e Use simulation distance for per-player mob spawns (#7247) 2022-01-02 15:05:08 +01:00
Shane Freeder
ffa0464d81 Provide option to disable username validation (Closes #7250) (#7254) 2022-01-02 12:51:22 +00:00
Noah van der Aa
ac54c26f5e Fix soul speed particles with hide-itemmeta enabled (#7239) 2022-01-02 00:26:53 +01:00
thamid-gamer
0418e96f5d Use isSensitiveToWater in nerfed check for water-sensitive mobs (#7236) 2022-01-01 16:56:41 -05:00
Spottedleaf
56420b0abd Allow . in usernames 2022-01-01 11:50:44 -08:00
Spottedleaf
545d476be4 Validate usernames 2022-01-01 05:48:17 -08:00
Jake Potrebic
a36a4e2018 Updated Upstream (Bukkit/CraftBukkit/Spigot) 2021-12-31 19:05:42 -08:00
Jason Penilla
a657f18f1f Fix vanilla LocalMobCapCalculator being used when per-player mob spawning is enabled (#7230) 2021-12-31 18:07:21 -08:00
Simon Gardling
459b947b53 [ci skip] Update log4j-api in Paper-API to 2.17.1 (#7227) 2021-12-31 17:26:20 -05:00
Jason Penilla
cb04758f6b Remove wrong update call in distance map add method 2021-12-31 13:59:34 -08:00
Noah van der Aa
0ca006fedf Fix riding distance statistics (#7021/SPIGOT-6475) (#7033) 2021-12-31 08:17:08 +01:00
LemonCaramel
7426c0370e Fix EntityLoadCrossbowEvent Sync Issue (#5739) 2021-12-31 15:54:23 +09:00
Lexi
04087a3e9a Check player world in endPortalSoundRadius (#6226) 
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 2021-12-30 22:50:44 -05:00
Owen1212055
8e0a15c372 Bucketable API (#7204) 2021-12-30 14:58:38 -05:00
Jake Potrebic
34f9abb2bd Fix bees aging inside hives (#6466) 2021-12-30 11:44:39 -08:00
BillyGalbreath
3b479df487 Expose isFuel and canSmelt methods to FurnaceInventory (#7181) 2021-12-30 02:42:16 -06:00
Jake Potrebic
57a0a45096 Dont register multiple ASK_SERVER suggestions under one parent node (#7188) 2021-12-29 23:11:40 -08:00
Shane Freeder
52fbecf5f4 Add debug stack for removed player teleporation check 2021-12-29 15:05:23 +00:00
Nassim Jahnke
7a47d06a49 Fix block key with negative y unpacking (#7219) 
Fixes #7218
 2021-12-29 10:34:38 +01:00
Nassim Jahnke
22d46134e3 https://youtu.be/NIH6j7-w198 2021-12-28 22:07:25 +01:00
BillyGalbreath
dbdad4bae9 Fix Chunk#isSlimeChunk when all-chunks-are-slime-chunks is true (#7211) 2021-12-28 13:15:04 -06:00
Owen1212055
d61fb337c7 Deprecate localized name API (#7212) 2021-12-28 14:13:27 -05:00
Shane Freeder
c78111ca2c Fix migration logic for old player saving config option 
This is an ode to all those times when you shoulda just gone to bed
 2021-12-28 08:10:38 +00:00
Glare
b63215914a [ci skip] Fix typo in getNearbyLivingEntities documentation (#7205) 2021-12-27 15:45:36 -08:00
Spottedleaf
c885b21024 Correctly parse last update for old chunks for regionfile recalc 
It's required so that comparisons between two chunks can be
made
 2021-12-27 13:35:09 -08:00
Spottedleaf
2ecc06a8fb Defensively copy chunk data in upgradeChunkTag 
The data provided is always from the regionfile thread, which
does not copy the data out. So if two separate calls need
the data, then there's going to be a problem.
 2021-12-27 04:11:21 -08:00
Jason Penilla
4c43d2f2b9 Remove making unused copy of visible chunks in ChunkMap#processUnloads 2021-12-27 03:53:25 -08:00
Jason Penilla
71e9154f02 Add uncaught exception handler using logger to usages of ThreadFactoryBuilder (#7179) 2021-12-23 02:32:26 -08:00
Josh Roy
cc1f56d99e Fix ABI breakage for plainSerializer (#7178) 2021-12-22 17:56:37 -05:00
Jake Potrebic
10610720ce Load effect amplifiers greater than 127 correctly (#7175) 2021-12-22 10:20:33 -08:00
Jake Potrebic
9170234f9a Fix duplicated BlockPistonRetractEvent call (#7111) 2021-12-22 10:02:31 -08:00
Nassim Jahnke
ca892181d9 Configurable max block light for monster spawning (#7129) 2021-12-22 12:47:15 +01:00
Riley Park
0df83e38b7 Adventure changes for Java 17 and Component support for resourcepack prompt 2021-12-21 23:07:17 -08:00
Jake Potrebic
7c67368f7f Add API for item entity health (#6514) 2021-12-21 23:07:15 -08:00
Jake Potrebic
5670cae051 Fix entity type tags suggestions in selectors (#6468) 2021-12-21 21:34:20 -08:00
Jake Potrebic
ba5ef6e1ac Entity powdered snow API (#6833) 2021-12-21 19:52:54 -08:00
Jake Potrebic
7bcbcb5337 Improve scoreboard entries (#6871) 2021-12-21 16:45:18 -08:00
Jake Potrebic
8df7046122 Forward CraftEntity in teleport command (#7025) 2021-12-21 16:40:24 -08:00
Jake Potrebic
dc7b80c213 Move VehicleCollisionEvent HandlerList up (#7112) 2021-12-21 16:34:44 -08:00
Jake Potrebic
a6dba1dac6 Fix breakNaturally for fluid-logged blocks (#7134) 2021-12-21 16:32:54 -08:00
Jake Potrebic
4bf1124114 Move setShouldBurnInDay to AbstractSkeleton (#7120) 2021-12-21 16:31:33 -08:00
Jake Potrebic
81cd10fd7e Add material tags for copper blocks (#7141) 2021-12-21 16:24:03 -08:00
Jake Potrebic
f9788fc8a1 Fix remapping issue with RangedAttackMob and RangedEntity (#7167) 2021-12-21 16:23:19 -08:00
Jason Penilla
b391c1cb92 Update checker framework & log4j-api for paper-api (also rebuild patches) 
Note that the log4j-api version used in paper-api does not affect the version used in paper-server, this just affects the version people will see in their IDE when compiling against paper-api.
 2021-12-21 01:17:52 -08:00
Noah van der Aa
eee1f6a0e0 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116) 2021-12-20 23:46:51 +01:00
Nassim Jahnke
8a5d6d18f8 Fix tripwire state inconsistency 2021-12-19 22:39:15 +01:00
Spottedleaf
a08630ed35 Only write chunk data to disk if it serializes without throwing 
This ensures at least a valid version of the chunk exists
on disk, even if outdated
 2021-12-19 09:15:22 -08:00
Spottedleaf
a5872264a3 Create sections for chunk conversion if non-existant 
Required to add in the new biome sections
 2021-12-18 01:04:00 -08:00
Nassim Jahnke
b71babb3c8 Update log4j to 2.17.0 2021-12-18 09:02:34 +01:00
Spottedleaf
1deca8eab9 Add missing return when datafixers fail for chunk conversion 
Caused the chunk to be later deserialized, which would
result in spamming unrelated errors (possibly) +
double chunk completion.
 2021-12-17 06:55:16 -08:00
Spottedleaf
8671893fb5 Bounds check biomes length before using. 
Missed the diff by Mojang that added this, apparently some
ancient code created zero-length biomes.
 2021-12-17 06:38:18 -08:00
DefineOutside
62a868c3e4 Fix empty voxel shape usage (Fixes #7043) 2021-12-15 18:15:04 +00:00
Jason Penilla
fd9b86bcb9 Fix WorldGenRegion leak when converting pre-1.18 chunks (#7097) 
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 2021-12-14 13:07:42 -08:00
Nassim Jahnke
fad4c0c23a Update log4j to 2.16.0 
No confirmed attack vector, and definitely no attack vector for normal setups, but, just in case.
 2021-12-14 20:08:40 +01:00
LemonCaramel
336217bc15 Add more Campfire API (#5779) 2021-12-14 05:57:39 +09:00
Owen1212055
3c9fb7812d [ci skip] Add nullable annotation to field (#7042) 
Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
 2021-12-12 23:31:32 -05:00
Lexi
e18cad9a03 Make org.bukkit.Keyed extend Adventure's Keyed (#7090) 2021-12-12 23:26:19 -05:00
Jake Potrebic
0d72808107 Updated Upstream (CraftBukkit) (#7105) 2021-12-12 19:59:43 -08:00
chickeneer
b98020331a Remove java 8 and prior reflection code from CustomTimingsHandler (#7096) 2021-12-12 01:03:06 -06:00
Jason Penilla
389b1401e9 Remove codec usage in chunk snapshot creation (#7093) 2021-12-11 17:50:45 -08:00
Nassim Jahnke
0e985b7b3b Update to 1.18.1 (#7076) 2021-12-10 15:24:07 +01:00
Glare
cad32bf4c1 Update Log4J (#7069) 2021-12-09 20:02:41 -06:00
Nassim Jahnke
fda4e8e392 Updated Upstream (CraftBukkit) 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
35d3986e Disable log4j message formatting
040e0c3b Increase outdated build delay
 2021-12-09 21:59:59 +01:00
Nassim Jahnke
8c901a518b Backport log4j fix 2021-12-09 17:55:19 +01:00
Jason Penilla
94afe500e2 Fix issue with snapshotted biomes in last commit 2021-12-09 04:34:11 -08:00
Jason Penilla
37bd203f8d Fix ChunkSnapshot#isSectionEmpty(int) 2021-12-09 04:09:31 -08:00
Spottedleaf
16d11b8180 Return 0 for light values if a dimenion does not have them 
Fixes https://github.com/PaperMC/Starlight/issues/99
 2021-12-08 22:01:02 -08:00
Spottedleaf
3bf392595d Fix bad ticking checks for blocks 
Caused blocks to tick outside of simulation distance
 2021-12-08 22:00:45 -08:00
Jake Potrebic
b895b00dd3 Fix entity equipment on cancellation of EntityDeathEvent (#5740) 2021-12-08 10:25:57 -08:00
Nassim Jahnke
8a05540192 Bump Starlight light version 2021-12-08 08:42:44 +01:00
Nassim Jahnke
df9844576b Fix light propagation in high y sections 2021-12-07 20:33:10 +01:00
Jason Penilla
6d4c9bd717 Fix unused EntitySectionStorage#getEntities(AABB, Consumer) method being broken 2021-12-06 19:40:26 -08:00
Jake Potrebic
f065566460 Fix mis-placed processEnchantOrder from 1.18 update (#7052) 2021-12-06 12:28:36 -08:00
Noah van der Aa
6de2d9794c Updated Upstream (Bukkit/CraftBukkit) (#7045) 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
ffd8b289 PR-687: Fix NPE from previous commits

CraftBukkit Changes:
3c2af1b7 SPIGOT-6831: Fix llama strength crash
 2021-12-06 13:43:46 +01:00
Jason Penilla
6d2ae19cee Port Actually unload POI data from Tuinity 1.16 (#7044) 2021-12-06 00:09:07 -08:00
Jake Potrebic
37cc5035e4 Include axolotls in affected entities for water splash potions (#7024) 
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 2021-12-05 17:56:55 -08:00
Jason Penilla
77bed7ff51 Fix empty/null chunk section check in LevelChunk#getBlockData, rename… (#7039) 
… patch and methods to make more sense with Mojang mappings
 2021-12-05 15:32:02 -08:00
Jake Potrebic
a271feefae Add dropped hunk from mid-tick tasks (#7034) 2021-12-05 13:58:01 -08:00
Jake Potrebic
69a15173ba [ci skip] Clarify setSize consequences for Slimes (#7036) 2021-12-05 13:16:55 -08:00
Jason Penilla
a529ce18ed [ci skip] fixup indent 2021-12-05 13:07:44 -08:00
LemonCaramel
84f5407999 Fix client world difficulty sync issue (#7035) 2021-12-06 04:44:17 +09:00
Shane Freeder
e185936159 Revert "#686: Fix contains for default section generating real sections" 
This commit causes an NPE when getting from the config in some states,
given upstream issue and PR in the works, I have 0 inclination to debug
this

This reverts commit e4358b8217126bbcc3a38b0d17097ad5ab87c50a.
 2021-12-05 15:20:52 +00:00
Shane Freeder
61ef48e0ce Revert "fix NPE from changes in e4358b82171" 
This reverts commit aa3d405b36.
 2021-12-05 15:10:39 +00:00
Gabriel Wolf
aa3d405b36 fix NPE from changes in e4358b82171 2021-12-05 14:36:47 +00:00
Nassim Jahnke
67aae31c6a Revert "Fix #6779" 
This reverts commit 781e8f5f00.
 2021-12-05 15:05:41 +01:00
Jake Potrebic
c9bbb9ab4e Update Optimise chunk tick iteration (#6950) 2021-12-05 06:00:13 -08:00
Jason Penilla
5bec4d54d0 Update Optimise collision checking in player move packet handling 2021-12-05 02:56:09 -08:00
Jason Penilla
781e8f5f00 Fix #6779 2021-12-05 01:04:07 -08:00
Jason Penilla
a30ee99728 Update Highly optimise single and multi-AABB VoxelShapes and collisions 2021-12-05 00:38:00 -08:00
Jason Penilla
c53d93419c Update and deprecate Allow delegation to vanilla chunk gen (#7031) 2021-12-05 02:27:20 -08:00
Jason Penilla
c9b5b5fbeb [ci skip] Remove reobfJar from paper-server publication (#7027) 2021-12-04 23:42:28 -08:00
Jason Penilla
44a9e2034e Remove debug checks from ZeroBitStorage (#7029) 2021-12-04 23:41:44 -08:00
Jake Potrebic
a6fdccf802 Updated Upstream (Bukkit/CraftBukkit) (#7022) 2021-12-04 23:11:59 -08:00
Jake Potrebic
07deb9ec78 further mitigate possible NPEs 2021-12-04 19:39:52 -08:00
Shane Freeder
55c371884e Fix trader merchants NPE when interacting with a merchant with non-active trades 2021-12-05 03:00:10 +00:00
stonar96
df42b6f60c Optimize HashMapPalette (#5074) 
HashMapPalette uses an instance of CrudeIncrementalIntIdentityHashBiMap
internally. A Palette has a preset maximum size = 1 << bits.
CrudeIncrementalIntIdentityHashBiMap has an initial size but is
automatically resized. The CrudeIncrementalIntIdentityHashBiMap is created
with the maximum size in the constructor of HashMapPalette, with the aim
that it doesn't need to be resized anymore. However, there are two things
that I think Mojang hasn't considered here:
1) The CrudeIncrementalIntIdentityHashBiMap is resized, when its initial
size is reached and not the next time, when a further object is added.
2) HashMapPalette adds objects (unnecessarily) before checking if the
initial size of CrudeIncrementalIntIdentityHashBiMap is reached.
This means to actually avoid resize operations in
CrudeIncrementalIntIdentityHashBiMap, one has to add 2 to the initial size
or add 1 and check the size before adding objects. This commit implements
the second approach. Note that this isn't only an optimization but also
makes async reads of Palettes fail-safe. An async read while the
CrudeIncrementalIntIdentityHashBiMap is resized is fatal and can even lead
to corrupted data. This is also something that Anti-Xray is currently
relying on.
 2021-12-04 15:56:34 +01:00