summaryrefslogtreecommitdiffstats
path: root/source/Blocks (unfollow)
Commit message (Collapse)AuthorFilesLines
2013-11-14Fixed growing issue with crops.Samuel Barney1-0/+6
2013-11-05Clarified cBlockHandler::ConvertToPickups() dox.madmaxoft1-1/+1
2013-11-05Implemented suggestionsTiger Wang1-13/+0
- Reverted changes to WebAdmin.cpp IPv6 ports and Server.cpp server description + Added default value explicitly for HardCore value * Split PluginManager plugin defaults write to new function - Removed a commented block from BlockTorch and... + Added g_BlockIsTorchPlaceable to Defines.h
2013-11-02Flipped some variables in PortalsTiger Wang1-2/+2
To make them work on the X axis.
2013-11-02Split border finder into separate functionTiger Wang1-10/+16
2013-11-02Implement suggestionsTiger Wang1-15/+15
- Removed unneeded parameter * Changed 0 - 1 to -1
2013-11-02Readded BlockPortal.h (portals)Tiger Wang2-0/+110
2013-11-02Fixed compile error (portals)Tiger Wang1-2/+182
WITH A FULL REFORK
2013-10-31Adhering to project standards.Samuel Barney1-1/+6
2013-10-31Added missing conventions for windows.Samuel Barney1-1/+1
2013-10-30Broken rail blocks now stack.Samuel Barney1-0/+3
2013-10-29Grass no longer grows under water, and water on top kills it.Samuel Barney1-2/+2
2013-10-13Removed faulty code dealing with water.Samuel Barney1-3/+2
2013-10-12Crop blocks now respect water and light. Currently a block has to be "watered" or the crop has a chance of breaking anyways.Samuel Barney1-1/+8
2013-10-04Optimized cBlockFarmlandHandler in wet weather.madmaxoft1-27/+26
The area isn't read at all when the weather is wet, since it isn't needed.
2013-10-04Added comparison for desert biomes.Samuel Barney1-1/+2
2013-10-04Rain now waters farmland.Samuel Barney1-0/+8
2013-09-22Fixed a few compiler warningsmadmaxoft2-2/+2
2013-09-22Removed some unneeded includesTiger Wang7-10/+0
2013-09-22Added button placement handlerTiger Wang4-1/+112
Also removed an unneeded variable in the stair handler
2013-09-22Removed OnDigging for Redstone devicesTiger Wang6-30/+1
2013-09-22Changed to SetBlockMetaTiger Wang3-3/+3
2013-09-19Fixed pickup block spawningTiger Wang1-8/+9
2013-09-18Fixed pickupsTiger Wang1-7/+11
2013-09-18Implemented redstone comparatorsTiger Wang3-2/+126
They can be placed and toggled, but stills needs proper redstone support
2013-09-18Multiple fixes [SEE DESC]Tiger Wang4-1/+68
- Removed two random block handling files in the item handling section that didn't do anything. (One was an attempt at making slabs work, but failed to realise that the coords would have to be the block CLICKED, and another was just a random empty file for handling wooden planks.) * Fixed placing repeater blocks not directioning properly * Fixed wood directions breaking plank metadata
2013-09-17Snow now supports meta valuesTiger Wang1-2/+22
Fixes #98
2013-09-17Added wood directionsTiger Wang1-0/+45
+ Added wood directions
2013-09-16Fixed derpy comparisonTiger Wang1-1/+1
2013-09-16Torch fixes [SEE DESC]Tiger Wang1-7/+8
* Torches snap to neighbour when placed on bottom * CanBeAt takes into account cobblestone walls + Used more BLOCK_FACEs instead of numbers
2013-09-15Fixed tigerw's leftovers.madmaxoft1-6/+0
2013-09-15Mycelium now has correct placement soundTiger Wang1-0/+5
2013-09-15Torches work properlyTiger Wang2-27/+72
Also fixed a naming inconsistency concerning quartz stairs.
2013-09-15Removed leftover CanBePlacedOnSideTiger Wang2-12/+0
2013-09-15Removed leftover DoesAllowBlockOnTopTiger Wang2-13/+1
2013-09-13Removed torch top placement preventionTiger Wang1-6/+0
2013-09-13Removed place on top and side preventionsTiger Wang13-113/+0
2013-09-11More changes [SEE DESC]Tiger Wang1-3/+2
* Improved (again) pumpkin direction handling * Fixed spacing in Entity.cpp
2013-09-11PumpkinsTiger Wang1-1/+1
2013-09-11moved reflection code to PlayerYawToMetadataworktycho1-4/+3
2013-09-11changed the subtaraction to a flipworktycho1-3/+3
2013-09-10Pumpkin and JackOLantern supportTiger Wang2-0/+65
Fixes #99
2013-09-09Fixed DropSpensers not rotating properlyTiger Wang1-1/+1
2013-09-09Added a few changes [SEE DESC]Tiger Wang1-0/+8
* Revised pickup comments * SlotArea pickup tossing now reflects Player.cpp * Removed unneeded ItemShears comment (was working already) * Sand and gravel pickups spawn with correct speed
2013-09-09Removed the cDoors class.madmaxoft3-9/+112
The helper functions that it implemented were moved into their respective blockhandlers.
2013-09-08Fixed torch placement.madmaxoft1-7/+17
This is related to #127, but until we know more about the change, I'm not closing the issue.
2013-09-07Renamed cWorld::DoExplosiontAt() to cWorld::DoExplosionAt()madmaxoft1-1/+1
2013-09-03Fixed inconsistent meta namingTiger Wang1-51/+51
2013-08-29Implemented xoft's suggestions [SEE DESC]Tiger Wang1-82/+51
Rail metas are now in BlockID and exported to LUA Minecart now does a SetMass, instead of m_Mass Minecarts use SubType instead of TypeType
2013-08-25Fixed iron door opening by handTiger Wang1-1/+4
2013-08-24Vines now spread when updatedTiger Wang1-0/+7
2013-08-24Added comments and fixed a bugTiger Wang1-39/+37
Bug was placing slabs between slabs not making a double slab.
2013-08-23Fixed incorrect double slab dropsTiger Wang1-2/+9
2013-08-23Double slabs work *choke choke*Tiger Wang3-12/+87
2013-08-21Changed comments to be more accurateTiger Wang1-4/+4
2013-08-21Fixed longstanding issue with slabsTiger Wang1-1/+12
Fixes FS#298
2013-08-20Fixed broken carpet handler [SEE DESC]Tiger Wang2-3/+10
Made BlockHandler pass on control to carpet handler Declared thinggummies in carpet handler Fixed carpet block pushback using incorrect format
2013-08-20Activator rail now uses rail handlerTiger Wang1-0/+1
2013-08-19Moved entities into the Entities subfolder.madmaxoft10-10/+9
2013-08-14Buncha bugfixes [SEE DESC]Tiger Wang2-1/+7
Fixed generation values not being written Fixed piston being able to push water Fixed ice creating a non-source block (still doesn't update though) Removed problematic piston code
2013-08-13Removed more commentsTiger Wang1-1/+0
2013-08-13Removed commentsTiger Wang1-7/+0
2013-08-12Added quartz stairs.STRWarrior1-0/+1
2013-08-11Really removed comments this timeTiger Wang1-7/+0
2013-08-11Removed unneeded case clauseTiger Wang1-15/+12
2013-08-11Tried adding bracketTiger Wang1-1/+1
2013-08-11Further attempt at fixing torch placementsTiger Wang2-10/+10
Also fixed block on flower placement. #71
2013-08-10Attempt at fixing torch placementTiger Wang1-3/+5
Attempt at fixing #71 and placement of torches.
2013-08-10Piston head, when removed, removes the associated piston body, too.madmaxoft3-1/+50
Fixes FS 388
2013-08-09Piston head, when removed, removes the associated piston body, too.madmaxoft3-1/+50
Fixes FS 388
2013-08-09Added OnExploding() and OnExploded() hooks.madmaxoft1-3/+6
As requested in FS 413, with extra parameters: World, BlockX, BlockY, BlockZ, Size, CanCauseFire, Source, SourceData OnExploding() can return 3 values: StopHook, CanCauseFire, ExplosionSize
2013-08-05Added the Carpet block.madmaxoft4-44/+102
2013-07-29Added the "Edit Sign" packet sent to the client placing a sign.madmaxoft1-0/+11
Fixes issue #20. The 1.6.2 client wouldn't open the sign editor UI unless it receives a special packet
2013-07-29Changed everyting to Unix line endings.Alexander Harkness61-4966/+4966
2013-06-18TNT fixes.madmaxoft@gmail.com2-40/+0
Other blocks can be placed next to TNT. Explosions activate nearby TNT blocks. TNT doesn't destroy bedrock, obsidian and liquid blocks. Server doesn't crash when a TNT (or other entity) leaves the valid Y range. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1603 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-15Fixed compilation on linux.nielsbreu@gmail.com1-1/+1
Any idea why SendMessageA works on Windows and not on linux? git-svn-id: http://mc-server.googlecode.com/svn/trunk@1595 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-15You can only sleep when the time is day, and beds explode if the dimension is not Overworld.nielsbreu@gmail.com1-11/+21
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1592 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-12Implemented the Hopper block handlermadmaxoft@gmail.com2-2/+50
Hoppers can be placed properly, but won't work yet. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1583 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09Fixed 2 more tabs...faketruth1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1571 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09Converted spaces to tabsfaketruth1-21/+21
Dead bush does not drop pickups when invalidly placed git-svn-id: http://mc-server.googlecode.com/svn/trunk@1570 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-09Added dead bush block handler so a dead bush pickup is dropped when the sand underneath it is removed.faketruth2-0/+49
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1569 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-04Removed cLadder, cSign, cStairs, cTorch and cVine classes, moved their functionality into the appropriate BlockHandlers / ItemHandlersmadmaxoft@gmail.com8-30/+186
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1555 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-26Implemented droppersmadmaxoft@gmail.com2-9/+9
Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24Refactored cInventory to use cItemGrid for the actual Storagemadmaxoft@gmail.com2-8/+5
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-20Stairs placement fix (patch contributed by Simi)madmaxoft@gmail.com1-1/+1
http://forum.mc-server.org/showthread.php?tid=503&pid=8159#pid8159 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1497 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09Fixed a few out-of-bounds readsmadmaxoft@gmail.com1-4/+12
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1465 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-27Fixed a few possible crashes with out-of-bounds Y coordsmadmaxoft@gmail.com1-1/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1413 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-18Initial implementation of explosions and TNT blockkeyboard.osh@gmail.com2-0/+40
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1392 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-06Cobwebs are now washed away by water and can be broken by swords and shears, giving string.madmaxoft@gmail.com2-0/+32
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1363 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-05Added carrots and potatoes handling, bonemealing and proper lighting.madmaxoft@gmail.com2-4/+57
FS #166 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-03Fixed crops producing pickups for creative mode players.madmaxoft@gmail.com1-8/+4
FS #350 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1356 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-26BlockArea: Finished rotation and mirroring with meta. Implemented example meta handling for vines, stairs and torches.madmaxoft@gmail.com4-1/+174
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1319 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-15Huge performance boost in blockhandlers, they have direct access to chunk data when blockchecking.madmaxoft@gmail.com19-166/+344
Also fixed vines' placement. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1278 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-09Pickups are now being saved into Anvil.madmaxoft@gmail.com5-8/+13
Also changed cEntity rotation datatype to double git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-28Simulators now have direct access to the cChunk object in the WakeUp() callmadmaxoft@gmail.com1-2/+2
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1227 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-16Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols.madmaxoft@gmail.com9-23/+23
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-27Added the HOOK_BLOCK_TO_PICKUPS hook that fires when a block is dug up and should be converted to pickups.madmaxoft@gmail.com3-5/+11
Note that cItems is used in the function signature but not yet exported in the API, TODO! git-svn-id: http://mc-server.googlecode.com/svn/trunk@1176 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-20Fixed piston placement.madmaxoft@gmail.com1-1/+1
FS #293 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1160 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-12Merged branch "branches/hooks" into "trunk".madmaxoft@gmail.com28-455/+633
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29Fixed compilation error in BlockCauldron.h on Linuxluksor111@gmail.com1-2/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1117 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29Cauldrons and Brewing Stands are now placeableluksor111@gmail.com3-0/+95
Cauldrons can be filled with water and used to fill bottles git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27Fixed Linux compilationluksor111@gmail.com1-3/+6
Fixed flower pot consuming items in creative mode git-svn-id: http://mc-server.googlecode.com/svn/trunk@1111 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27Added flower potsluksor111@gmail.com2-0/+82
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-21Added sounds to levers and mobsluksor111@gmail.com1-1/+10
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1093 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-20Fixed a bool evaluation warning in BlockDoor.hmadmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1083 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19Added dispensers (they can't dispense items yet)luksor111@gmail.com4-16/+15
Fixed crash when digging snow Moved BlockPlace hook check, so Core plugin will no longer block item usage Player chat messages are now visible in the console git-svn-id: http://mc-server.googlecode.com/svn/trunk@1081 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-19Implemented double doorsluksor111@gmail.com4-11/+82
Implemented fence gate Updated g_BlockTransparent[] Doors can now only be opened by right clicking Doors will now drop when not supported by block git-svn-id: http://mc-server.googlecode.com/svn/trunk@1080 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-16Levers (patch contributed by Keyboard)madmaxoft@gmail.com3-0/+114
http://forum.mc-server.org/showthread.php?tid=649 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1075 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-27Added initial adventure mode supportluksor111@gmail.com3-2/+30
Added missing Emerald crafting recipe You get more fall damage when jumping Torch no longer protects players from fall damage Fixed Ender Chest drops git-svn-id: http://mc-server.googlecode.com/svn/trunk@1070 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-26Fixed certain blocks crashing clients when minedluksor111@gmail.com4-2/+31
Fixed rail duplication glitch Fixed fall damage calculation Glass no longer drops glass git-svn-id: http://mc-server.googlecode.com/svn/trunk@1068 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-25Implemented rail placement mechanics.luksor111@gmail.com2-0/+319
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1065 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-24Fixed drops for: Stone, Mycelium, Redstone Torch.luksor111@gmail.com3-1/+33
Fixed item usage for Jukeboxes and Spawn eggs in survival. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1064 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-16Fixed boolean comparison.madmaxoft@gmail.com1-3/+3
Don't compare booleans to false / true, use them directly. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1048 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-15- Added the "wait" music discluksor111@gmail.com1-4/+6
- Vines can now be placed on leaves git-svn-id: http://mc-server.googlecode.com/svn/trunk@1045 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-26Fixed a valgrind warning in BlockDirt.madmaxoft@gmail.com1-3/+4
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1011 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-23New Block property g_BlockIsSolid[]; Fixed ladder, torches and vines placement. (Patch contributed by funmaker)luksor111@gmail.com5-62/+46
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1005 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-22Slight formatting tuneup to the previous commit.madmaxoft@gmail.com1-4/+7
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1003 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-22Vine decay (patch contributed by funmaker)madmaxoft@gmail.com1-7/+44
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1002 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-21Added jukeboxes (patch contributed by Luksor)madmaxoft@gmail.com1-0/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@994 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-20Double chests are formed correctly in all situations (meta is adjusted for the neighboring chest)madmaxoft@gmail.com1-2/+70
git-svn-id: http://mc-server.googlecode.com/svn/trunk@991 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-20Chest does check if it can be placed at the coords specified (the client does the check itself, too, but this may be good for scripts)madmaxoft@gmail.com1-0/+68
git-svn-id: http://mc-server.googlecode.com/svn/trunk@989 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-14Floody fluid simulator now dries up correctly, too.madmaxoft@gmail.com3-1/+48
git-svn-id: http://mc-server.googlecode.com/svn/trunk@964 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-13Preparation for multiple fluid simulators.madmaxoft@gmail.com1-1/+1
Moved all simulators into a subfolder. Replaced cWaterSimulator and cLavaSimulator with a generic cFluidSimulator. Moved original fluid simulation into cClassicFluidSimulator. Fluid simulator parameters (MaxHeight, Falloff) are read from the world.ini file (can have nether-like lava with lower falloff) git-svn-id: http://mc-server.googlecode.com/svn/trunk@956 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-07All blockticking is now done in cBlockHandlersmadmaxoft@gmail.com3-121/+185
git-svn-id: http://mc-server.googlecode.com/svn/trunk@942 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-06Completely removed the old (buggy) redstone simulator.madmaxoft@gmail.com3-29/+77
git-svn-id: http://mc-server.googlecode.com/svn/trunk@937 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-03Minor style cleanupmadmaxoft@gmail.com1-1/+1
git-svn-id: http://mc-server.googlecode.com/svn/trunk@922 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-03Moved blockticking into blockhandler classes.madmaxoft@gmail.com47-392/+444
Also slightly refactored the variable / argument names (BlockID is deprecated, use BlockType instead) git-svn-id: http://mc-server.googlecode.com/svn/trunk@921 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-10-01Slight refactoring of BlockHandlers - dropping unneeded virtual functionsmadmaxoft@gmail.com38-490/+842
( http://forum.mc-server.org/showthread.php?tid=434&pid=4734#pid4734 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@917 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-30Added some missing block enumsfaketruth1-0/+3
Spruce, birch and jungle wood stairs now orient correctly git-svn-id: http://mc-server.googlecode.com/svn/trunk@916 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29Forgot to commit BlockBed.cppfaketruth1-0/+77
git-svn-id: http://mc-server.googlecode.com/svn/trunk@913 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29Beds can be slept in now (it doesn't change the time though)faketruth1-61/+7
git-svn-id: http://mc-server.googlecode.com/svn/trunk@911 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-09-29Unified folder name-casingmadmaxoft@gmail.com46-0/+2538
git-svn-id: http://mc-server.googlecode.com/svn/trunk@902 0a769ca7-a7f5-676a-18bf-c427514a06d6