KingCol13
272a8029e0
Fix silk-touching glowing redstone ( #4893 )
...
* Add src/BlocksRedstoneOre.h to CMakeLists.txt
* Fixed silk touch pickaxe not dropping redstone ore (and dropping null item instead)
2020-09-19 06:59:21 +00:00
Tiger Wang
e2e78abdb7
Style, no need to tag struct with s
2020-09-18 16:41:06 +01:00
Tiger Wang
608e7a9950
Remove unused ServerPort argument
2020-09-18 16:41:06 +01:00
Tiger Wang
7f372b12cb
Add State enum to protocol
2020-09-18 16:41:06 +01:00
Tiger Wang
bf253caab5
Remove unused ServerPort member
2020-09-18 16:41:06 +01:00
Tiger Wang
acc399ffb3
Cleanup Protocol classes
...
* Visibility, static, ordering changes
2020-09-18 16:41:06 +01:00
12xx12
c18fe8aa45
Adding Generator For Single Piece Structures ( #4830 )
...
* the beginning of a magnificent work - added basic files and classes without functionality
* fixed checkstyle
* added imports
* moved imports
* - Adding SinglePieceStructureGen
- Adding a cPrefabChestStructure to generate Chests with contents
- Added the options and calls to the ComposableGenerator
* moved Globals to .h file
* removed the chest thingy from the code (for now)
* Update SinglePieceStructureGen.cpp
* readded whitespace
* renamed to SinglePieceStructuresGen for consistency
added new classes to test
* fixed small things (mostly style and cleanup)
removed loottables
* added small changes suggested by madmaxoft
* small change to documentation
* added check for allowed biomes
* check only the biome of the origin position
* fixed error on IsBiomeAllowed
* added new cubesets
* updated structures for with sponging
* updated biome names
* updated metadata to prevent crashing
removed debug output
* updated structures with sponging
* added sponging to deserterWell to make it disappear in sand
* small change in meta
* rename DesertTemple -> DesertPyramid
* minor style changes
Co-authored-by: 12xx12 <12xx12100@gmail.com>
Co-authored-by: Alexander Harkness <me@bearbin.net>
2020-09-17 22:20:50 +00:00
Elias Thomson
f7091e1b19
Fixed leaves and wheat not breakable with piston ( #4882 )
...
* Fixed leaves and wheat not breakable with piston
* Fixed alpha-sort
* Add beetroots
Co-authored-by: Elias Thomson <fiv.pids@gmail.com>
2020-09-17 21:03:02 +00:00
12xx12
ba5312c198
Fixed snow golems and added documentation to damage type and added damage type for damage from environment to mobs ( #4877 )
...
* made snow golems not crashing the server anymore
* changed damage type to environment
* updated damage in API dopcumentation and changed enderman damage type
* removed incidental d in the code
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-09-17 18:06:41 +00:00
Tiger Wang
c3d2956ba5
BlockHandler: no dynamic allocation ( #4862 )
...
* BlockHandler: no dynamic allocation
2020-09-17 14:51:42 +01:00
12xx12
53549a1a4c
Add some const qualifiers to functions ( #4874 )
...
* add some const qualifiers to functions
* added changes suggested by @tigerw
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-09-16 22:01:20 +00:00
Elias Thomson
a90dedffeb
Fixed doors not breakable by piston ( #4869 )
...
Co-authored-by: Elias Thomson <dev@eliasthomson.com>
2020-09-15 19:47:23 +00:00
Tiger Wang
d9d71e1de6
Rail: avoid invalid game states ( #4864 )
...
+ Check CanBeAt
Ref: #4859
Co-authored-by: Alexander Harkness <me@bearbin.net>
2020-09-13 13:44:20 +00:00
Tiger Wang
33f3c18bc1
Beds: derestrict clicking block face ( #4863 )
...
Ref: https://github.com/cuberite/cuberite/issues/4860#issuecomment-691545904
2020-09-13 10:58:39 +00:00
Tiger Wang
198407807f
Reverse order of ChunkSender priorities ( #4858 )
...
* Reduces confusion when using overloaded operator< and priority_queue
Co-authored-by: peterbell10 <peterbell10@live.co.uk>
2020-09-12 19:43:18 +00:00
Tiger Wang
93adbdce9a
Use tracing for explosions ( #4845 )
...
* TNT: Implement tracing algorithm
+ Add intensity tracing
* Fix iterating over all players to SendExplosion, even those not in range
* Implemented TNT entity interaction
* Fixed misaligned destruction tracing
* Finalise TNT algorithm
- Remove BlockArea and just use chunks
Using SetBlock makes it so that we can update everything properly, and does appear to be faster.
* BlockInfo learns about explosion attentuation
* Rename Explodinator parameters
* TNT: pull block destruction into common function
Co-authored-by: Alexander Harkness <me@bearbin.net>
2020-09-12 18:57:44 +00:00
SatoKaito
834d61dacc
fixed missing include for FreeBSD. ( #4852 )
2020-09-10 00:17:06 +01:00
12xx12
c2f8ceb554
Add more statistic tracking ( #4837 )
...
+ Added possible 1.8 stats
+ Added stat tracking for 1.8.2
+ Added stat tracking for 1.9
+ Added the breed cow achievement
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-09-05 16:13:44 +01:00
12xx12
2d197e147e
Use pitch lookup in noteblock block entity ( #4826 )
...
- Removed the calculation in the noteblock block entity
I did the calculation in python if anyone is interested where the numbers are from
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-09-05 16:07:01 +01:00
Tiger Wang
040380321c
WriteConsoleInput can return FALSE when running as servic
2020-09-05 14:23:54 +01:00
Tiger Wang
29808c61c9
Reformat messages in NonCtrlHandler
2020-09-05 13:41:42 +01:00
Tiger Wang
1bc12ba2b3
Streamline startup sequence
...
* Clean up cRoot & main
* Move some OS-specifics into OSSupport
2020-09-05 13:16:52 +01:00
Tiger Wang
5e670a050b
Rename AddEntityIfNotPresent to AddPlayer
...
+ Always make a chunk for the player to go into
* Fixes #4847
2020-09-03 22:25:35 +01:00
Tiger Wang
f84e805453
Entities can fail to add into a chunk
...
- MoveEntityToNewChunk, AddEntity can fail. Ensure we handle these cases correctly
2020-08-29 21:34:21 +01:00
Tiger Wang
07ffd9f6f3
Unused/duplicate function cleanup
...
* FaceIntToBlockFace in 1.8/1.9 protocol merged
- Removed undefined permissions stuff in Player header
2020-08-29 16:47:40 +01:00
Tiger Wang
d2e92440eb
Remove redundant DoWithChunkAt in chests
2020-08-28 21:43:12 +01:00
Tiger Wang
5d736b653f
Minor style fixes
2020-08-28 21:42:37 +01:00
Tiger Wang
c1ffed60ec
FastNBTWriter: AddString now uses string_view
...
* Avoids an allocation for all those string literals we pass in
2020-08-28 21:42:18 +01:00
Tiger Wang
8fa8ee96fc
Broadcaster: don't loop over all entities to broadcast one's position
...
* Use ForClientsWithEntity
2020-08-28 21:41:18 +01:00
Tiger Wang
be121f9e80
Save enderchest block entities to storage
...
+ Add EnderChest saving, as Vanilla does
- Remove CreateBlockEntities. Storage should save & load everything so looping over chunk data is not needed
2020-08-28 21:40:40 +01:00
Tiger Wang
da9158937d
WorldStorage: Removed unused callback parameters
2020-08-28 21:36:46 +01:00
Tiger Wang
071aee6c79
Clean up pickup collection to use ForEachEntityInBox
2020-08-28 21:35:38 +01:00
Tiger Wang
167247328a
Chunk: Make StayCount/AlwaysTicked unsigned
2020-08-28 21:34:23 +01:00
Tiger Wang
7023548de0
Simplify MoveEntityToNewChunk
...
- No longer try getting from the chunkmap if GetNeighborChunk fails, since nothing else does this and entities (in future) will not tick close to an unloaded chunk edge
* GetRelNeighborChunk uses FindChunk
2020-08-28 21:32:46 +01:00
Tiger Wang
08bd77e547
Clean up GenerateChunk/TouchChunk
...
- Remove TouchChunk
- Remove unused bool return value in GenerateChunk
- Remove ShouldGenerateIfLoadFailed
2020-08-28 21:26:04 +01:00
Tiger Wang
72ae5ecb5a
ChunkMap: do not wantonly make empty chunks
...
- Removed calls that constructed an empty chunk, found it was invalid, and did nothing with said chunk
Partially addresses #2324
2020-08-28 21:22:44 +01:00
Tiger Wang
b084f1f13f
Remove unneeded MarkDirty, SendToClients parameters of SetMeta
...
Partially reverts #3129 , whose addition of these parameters was superseded by #3149 that fixed generated leaves' metas.
References:
https://github.com/cuberite/cuberite/pull/4417#discussion_r334950513
e0bcd754009f16480437b2c1fa5e7fbedab31496
2020-08-28 21:08:06 +01:00
Tiger Wang
ecd8f0c0de
1.13+: Send length-prefixed server Brand string
...
Ref: 5176c22656
2020-08-28 21:08:06 +01:00
Mattes D
3d7acb6d10
Removed const
2020-08-27 17:32:48 +01:00
Mattes D
c98a2d9acf
Changed tree-growing functions in cWorld to use Vector3i coords.
2020-08-27 17:32:48 +01:00
Mattes D
0e3039d44c
Added a "reloadweb" command for reloading web admin config.
2020-08-27 17:32:32 +01:00
Peter Bell
fa917259a5
Fix doors and trapdoors closing on server restart
2020-08-25 21:38:49 +01:00
Tiger Wang
a473e8ba52
ChunkDataSerializer: don't repeatedly mallocate
...
+ Store an instance of the class, the way it seems it is meant to be used.
2020-08-21 18:22:04 +01:00
Tiger Wang
440523b022
CompressPacket: reserve CompressedSize, not the uncompressed size
...
+ Assign the length data to a_CompressedData to overwrite it, mirroring the behaviour of cByteBuffer::ReadAll
2020-08-21 18:17:45 +01:00
Tiger Wang
8620f6a13e
StatSerializer: use std::move
2020-08-21 18:15:34 +01:00
Tiger Wang
e23dcffaff
Make StatSerializer a namespace
2020-08-21 00:53:10 +01:00
Tiger Wang
8cca3db61b
Consolidate various Chunk serialisers under one roof
...
* Merge most into WriteSectionDataSeamless
2020-08-21 00:53:10 +01:00
Tiger Wang
2d28d681c7
Remove unused variables in ChestEntity/BlockEntityWithItems
2020-08-21 00:53:10 +01:00
Tiger Wang
82d251b71b
Made cProtocol::Version, EntityMetadata enums less verbose
2020-08-21 00:53:09 +01:00
Tiger Wang
9a9079d3da
Remove complex templated SendBlockChange
...
If we're sending enough blocks to have virtual calls be an issue, we should resend the chunk instead.
2020-08-21 00:53:09 +01:00
Tiger Wang
d8c8d0124d
Replace PowerData struct with PowerLevel
...
* We no longer need to track the powering block with the removal of SolidBlockHandler. PowerLevel is now just an unsigned char
2020-08-21 00:50:09 +01:00
Tiger Wang
03557e978e
cChunk's deleted copy constructor needs const
2020-08-21 00:50:09 +01:00
Tiger Wang
d1b0d0f5b5
Remove level of indirection in cChunk storage
...
- No more unique_ptr storage
2020-08-21 00:50:09 +01:00
Tiger Wang
3143d6ce67
Remove std::make_unique from redstone handler creation
2020-08-21 00:50:09 +01:00
Tiger Wang
6617d43983
Minor typo fixes
...
* Also DeMorgan'd Emerald ore condition
2020-08-21 00:50:09 +01:00
12xx12
70ab8d2f96
Adding block entity transmission to 1.13 ( #4829 )
...
+ Adding block entity transmission to 1.13
+ Added HandlePacketSetBeaconEffect
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-08-19 20:46:03 +01:00
Tiger Wang
963ec77575
Add statistics upgrade mapping
2020-08-19 20:45:27 +01:00
Tiger Wang
f23402dacd
Add FileStream wrapper
2020-08-19 20:45:27 +01:00
Tiger Wang
dbc81c3548
Add statistics palette for 1.15 & 1.16
2020-08-19 20:45:27 +01:00
12xx12
7d0813ce8c
Add Statistics and Achievements for newer Network standards
2020-08-19 20:45:27 +01:00
12xx12
47f7727b7f
Add enhanced Gold generation in Mesa-Type Biomes ( #4821 )
...
* added enhanced gold generation in mesa-type-biomes
* fixed typo in comment
* added enhanced gold generation in mesa biomes - fixed small checkstyle errors
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-08-12 07:20:38 +00:00
12xx12
a3594f22c2
Update FinishGen.cpp
2020-08-09 22:05:13 +00:00
12xx12
ec3de19c4e
small issues addressed in #4817 fixed because was merged to fast
2020-08-09 22:05:13 +00:00
ion232
1b17ec4ca9
Fix enderchest placement rotation
2020-08-09 21:08:48 +00:00
12xx12
fed03048ad
Adding Emeralds to generation ( #4817 )
...
* Adding Emeralds to generation
* fixed crash
* fixed documentation and changed function name to match others
* forgot to change the name in the doc
* removed debug output - sorry build servers
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-08-09 20:49:40 +00:00
ion232
f65679d1d4
Fix arrows preventing block placement
2020-08-09 10:19:01 +00:00
Tiger Wang
40eba5244d
Remove the redstone solid block handler
...
- Remove cSolidBlockHandler
* Functionality now integrated into simulator dispatcher
* Fix door double open/close issues, arisen due to the top/bottom halves getting different power
+ Small migration to block states for redstone wire
2020-08-08 18:22:16 +01:00
Tiger Wang
2f79ab2e26
const-ify some Chunk functions
2020-08-08 12:09:40 +01:00
Alexander Harkness
b45d8bfc1e
Revert "Hotpatch optional for macOSX builds on buildserver"
...
This reverts commit 5e3f51f5ff
.
2020-08-06 12:36:41 +01:00
Mat
cb1f0a5af2
Update bed behavior ( #4545 )
2020-08-05 19:38:29 +00:00
12xx12
5176c22656
imprementing plugin message to send server brand ( #4786 )
...
* fixed issue #4773
Co-authored-by: 12xx12 <12xx12100@gmail.com>
2020-08-05 18:55:19 +00:00
Alexander Harkness
d6c5ac40a6
Fix big tree ring radius calculations. Ring radius now stays within range.
2020-08-05 18:41:19 +01:00
mBornand
4c0e7e0ab4
edit comment
2020-08-05 18:41:19 +01:00
mBornand
295d8e1a6c
update comment
2020-08-05 18:41:18 +01:00
mBornand
eaae8be44b
correct error
2020-08-05 18:41:18 +01:00
mBornand
ad05e9e3f4
correct error
2020-08-05 18:41:18 +01:00
mBornand
e9bf6edbeb
large conifers sapplings grow
2020-08-05 18:41:17 +01:00
mBornand
e7b37b7965
error in comment end
2020-08-05 18:41:17 +01:00
mBornand
987f6ddeaa
add Large conifers
2020-08-05 18:41:16 +01:00
Tiger Wang
d2156aab7c
WakeUpSimulators correct Y computation
...
+ Add Y validity check to SimulatorManager
2020-08-05 08:35:37 +01:00
Tiger Wang
c0d1cffe0b
Delete unreferenced variable
2020-08-05 08:35:37 +01:00
Tiger Wang
25906a3b87
Adjust incorrect palette inclusions
2020-08-05 08:35:37 +01:00
Tiger Wang
5ed4222dee
Delete redundant std::move in World loader
2020-08-05 08:35:36 +01:00
Alexander Harkness
5e3f51f5ff
Hotpatch optional for macOSX builds on buildserver
2020-08-04 23:01:39 +01:00
12xx12
781d648571
Code cleanup in cChunk.PlaceBlock() for checking if BlockEntity should be spawned ( #4812 )
...
* Changed switch for call in cChunk for call to function cBlockEntity to remove unnecessary confusions while implementing new BlockEntities
2020-08-04 19:01:36 +01:00
Tiger Wang
5bb6512435
Simply Y-check in door handler
2020-08-04 18:26:25 +01:00
Tiger Wang
766a950d20
Continue with placement when using iron doors
2020-08-04 18:18:37 +01:00
Tiger Wang
71ba18d6c6
Door drops respect player gamemode
...
* Rely on caller to handle converting to pickups, all OnBroken needs to do is to maintain the unity of the door
* Fixes #4797
* Fixes #4796
2020-08-04 18:15:18 +01:00
Tiger Wang
c3d6afe47e
Corrected wakeup sequences
...
* Pistons/Ice no longer need to FastSetBlock first (#4600 ), and the former don't drop items when broken in creative
- Begin migration away from stationary fluids
* Tick the chunk after applying a client's changed
* Broadcast pending blocks at the end of a tick
2020-08-04 18:15:18 +01:00
Tiger Wang
6bdd130aab
OnBroken/OnPlaced are for entity actions
...
* Call OnPlaced/OnBroken in PlaceBlock/DigBlock
- Remove unused Placing/Breaking handlers
* Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors
2020-08-04 18:15:18 +01:00
Tiger Wang
adb86a75da
Do not GetBlock individually in simulators
...
* Have the simulator manager get the block and pass it on
+ Add new overload for WakeUp, called when the manager wakes face positions
2020-08-04 18:15:18 +01:00
Tiger Wang
b205d233bd
Use std::queue for the block tick queue
2020-08-02 15:52:06 +01:00
Tiger Wang
71ffa76847
Remove unused block tick related cChunk functions
2020-08-02 15:52:06 +01:00
Tiger Wang
225c2fa9f6
Always use relative coordinates in AddBlock
...
+ Pass block, use relatives
* Fixes everything immediately converting abs back to rel and getting block, when these data were already available
2020-08-02 15:52:06 +01:00
Tiger Wang
99856df686
Add WakeUp/AddBlock distinction
...
* WakeUp is for singular changes (block breaking for example). The simulator should check blocks around the position and discover other affected blocks as it sees fit
* AddBlock is for when you know a whole area is to be updated; chunk loading, or area wakeups for example
+ Prepares for correct handling of destroyed blocks after removal of SolidBlockHandler in the redstone simulator
2020-08-02 15:52:06 +01:00
Tiger Wang
6d7b83a69d
Do not impose redstone wakup penalty for all blocks
2020-08-02 15:52:06 +01:00
Tiger Wang
fd5191854d
Delegate simulator wakeup to cChunk
2020-08-02 15:52:06 +01:00
Tiger Wang
6c47f46c31
Ensure updating relatives calls the correct base case
...
* Fixed recursive base unintentionally scheduling the origin position for an update because it called the wrong function
2020-08-02 15:52:06 +01:00
Mattes D
46398f4671
Replaced cpp14::make_unique<> with std::make_unique<>.
2020-08-01 20:04:31 +01:00
12xx12
54e499c065
Added HandleCraftItem call to ShiftClickedResult to make sure achievements are awarded ( #4791 )
2020-08-01 20:23:01 +02:00