Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-07-03 01:45:12 +02:00
Code Issues Projects Releases Wiki Activity
4,252 Commits 32 Branches 0 Tags 269 MiB
619a9b3209
Commit Graph

3820 Commits

Author SHA1 Message Date
TheMode
2ecd10a4ec Cipher#update is copy-safe 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-15 03:47:48 +02:00
Moulberry
c5362bffba Remove debugging 2021-09-14 17:50:56 +08:00
Moulberry
ee435f43f2 Set proper pose once flying finishes 2021-09-14 17:50:19 +08:00
Moulberry
1933914bbc Set proper pose once flying finishes 2021-09-14 17:43:02 +08:00
Moulberry
73ea79bed2 Fix flying clip bug 2021-09-14 17:37:57 +08:00
TheMode
7737d0e5b3 Cleanup MultiBlockChangePacket 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-14 08:14:14 +02:00
TheMode
2d3daf2504 Share code 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-14 07:20:58 +02:00
TheMode
8fce62ccba Simplify tick loop 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-14 04:36:10 +02:00
TheMode
983850171b Use cleaner to reuse connection buffers 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-14 02:22:58 +02:00
TheMode
561a10bddc
Merge pull request #459 from Project-Cepi/log-class-loader-finalization 
Use proper logging to log class loader finalization
 2021-09-14 01:20:48 +02:00
TheMode
2f9b649466 Reduce memory used for viewable packets 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-13 23:01:37 +02:00
TheMode
e1a3c295a2 Add dedicated PooledBuffers class 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-13 22:12:07 +02:00
Moulberry
5bf4758a3a Remove extra chunk unloads 2021-09-13 15:08:57 +08:00
Moulberry
9531bd5cb3 Merge upstream 2021-09-13 15:07:11 +08:00
Moulberry
0360fd3f79 Fix 2 entity loading issues 2021-09-13 15:05:16 +08:00
TheMode
527141df74 Nvm, the barrier is not necessary 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 23:44:53 +02:00
TheMode
ecd2200e1a Insert barrier 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 23:22:32 +02:00
TheMode
d9c32fe198 Improve TickThread 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 23:20:22 +02:00
TheMode
06d8586f7f Improve the thread provider api 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 22:55:37 +02:00
TheMode
c31aa8a7ec More safety in Acquired + doc 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 06:29:33 +02:00
TheMode
7b059d2be5 Remove redundant comments/methods 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-12 02:34:29 +02:00
LeoDog896
ab35022f60 Use slf4j instead of println for finalization (MinestomExtensionClassLoader) 2021-09-11 17:42:30 -04:00
TheMode
e77e32889b
Merge pull request #458 from Project-Cepi/add-chunk-ref-to-block-handler-methods 
Add chunk reference to Tick, blockPosition (Tick) -> relativeBlockPosition
 2021-09-11 23:20:41 +02:00
LeoDog896
adab546d33 Remove unnecessary imports 2021-09-11 17:19:24 -04:00
LeoDog896
332a8536be Use absolute coordinates 2021-09-11 17:08:03 -04:00
TheMode
5106927b10 Add Acquirable#isLocal 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 20:24:11 +02:00
LeoDog896
888405c54c Add chunk reference to Tick 2021-09-11 11:49:14 -04:00
TheMode
42f4678db0 More style 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 06:13:48 +02:00
TheMode
b5062ab4d6 Gravity tick counter should be part of the velocity tick method 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 05:54:26 +02:00
TheMode
3977b6f967 Code style 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 05:31:35 +02:00
TheMode
ee95015ed3 Simplify packet reading 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 03:39:59 +02:00
TheMode
0c5b37ed18 Optimize unnecessary chunk coordinate conversion 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 01:04:11 +02:00
TheMode
73237bb11b Fix wrong constant being used 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-11 00:04:35 +02:00
TheMode
75dbacf8aa
Merge pull request #455 from RinesThaix/inventorySlots 
Resolving inventory- events and condition slot-issues
 2021-09-10 18:11:59 +02:00
Шандуренко Константин Владимирович
6c76baa940 Code review 2021-09-10 19:08:39 +03:00
Шандуренко Константин Владимирович
1e5dc8d870 Removed stateless-related stuff from BlockManager 2021-09-10 18:42:21 +03:00
Шандуренко Константин Владимирович
e990283c40 Resolving inventory- events and condition issues 2021-09-10 18:38:27 +03:00
Шандуренко Константин Владимирович
98fc704139 BlockHandlerBase 2021-09-10 16:50:38 +03:00
Шандуренко Константин Владимирович
e3600525fa BlockManager#registerStatelessHandler 2021-09-10 16:48:01 +03:00
Шандуренко Константин Владимирович
f45484c840 Removed synchronization on BlockManager methods, related to handlers 2021-09-10 16:45:04 +03:00
Шандуренко Константин Владимирович
2f2254ebc2 Setting up BlockHandler for blocks loaded by AnvilLoader 2021-09-10 16:42:59 +03:00
TheMode
6355f06d53 Compression buffer has now multiple purpose 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 06:35:34 +02:00
TheMode
3ddf729a46 Code style, remove deprecated ChatMode 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 05:50:08 +02:00
TheMode
e6db47ec6e Add fancy Player#sendPacket shortcut 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-10 05:41:54 +02:00
TheMode
fd027ecfd7 Do not forget to put the buffer back in the pool queue 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:18:14 +02:00
TheMode
526108b896 Remove unnecessary allocation during encryption 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:15:57 +02:00
TheMode
344003f36a VanillaStackingRule style 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 23:14:59 +02:00
TheMode
f48199397a Simplify acquisition 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 20:49:54 +02:00
TheMode
acb8634b4b Acquirable style cleanup 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 17:16:20 +02:00
TheMode
1c719a2fd7 Make getChunkCoordinate smarter and more efficient 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 06:57:46 +02:00
TheMode
6ab94bb778 One less magic value 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-09 00:26:10 +02:00
TheMode
d7a116c144 Prevent buffer being resized in writeFramedPacket, it is now possible to know if a buffer couldn't be written to 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 22:26:18 +02:00
TheMode
f023b1bc07 Simplify writeVarIntHeader 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 22:23:37 +02:00
TheMode
21bac6fba4 Better name for the local deflater, add link to the packet format 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 20:31:13 +02:00
Moulberry
788bb71587 Fix initial startCondition of DOUBLE_CLICK being wrong as well 2021-09-08 23:22:22 +08:00
Moulberry
08c9339fae Fix double-click calling startCondition on the wrong inventory 2021-09-08 22:55:48 +08:00
Moulberry
571624a952 Fix duplication glitch with shift-click 2021-09-08 22:45:11 +08:00
Moulberry
9e5fadaa0e Fix broken cursor with window items packet 2021-09-08 21:50:14 +08:00
TheMode
025052102d Ensure positive chunk view distance from the client 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 05:24:59 +02:00
TheMode
ffbc8e5f27 Fix Player#getLocale 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-08 00:54:00 +02:00
TheMode
3e386a1491 Send unload packet 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 21:26:24 +02:00
TheMode
e1c4a7afce Fix chunk 0 being sent multiple time 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 20:14:15 +02:00
TheMode
4a260b98c2 Simplify/Improve getChunksInRange 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 19:58:26 +02:00
Шандуренко Константин Владимирович
6c4eda3bb7 Chunk-related improvements 2021-09-07 19:24:24 +03:00
TheMode
4b7adae382 Make DimensionTypeManager thread-safe 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 16:47:14 +02:00
TheMode
1c76fd152e Fix viewable packet when a connection has multiple pairs 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 04:47:33 +02:00
TheMode
adf1023e35 There is no commit here - fix compression 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 01:31:34 +02:00
TheMode
8f1e84ffdb Prevent framed packets from being corrupted 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-07 01:24:51 +02:00
Шандуренко Константин Владимирович
85da1c073a Marked AbstractInventory with @NonExtendable 2021-09-06 21:10:40 +03:00
Шандуренко Константин Владимирович
2634042f7d InventoryItemChangeEvent is now recursive and not it's PlayerInventory-based child 2021-09-06 20:27:11 +03:00
Шандуренко Константин Владимирович
8f277cdb17 Removed unused imports 2021-09-06 20:24:20 +03:00
Шандуренко Константин Владимирович
5db56312f7 Code review 2021-09-06 20:23:37 +03:00
Шандуренко Константин Владимирович
8a04d7eed9 InventoryItemChangeEvent 2021-09-06 19:59:55 +03:00
TheMode
72987ac52f Save the server from crashing from OOM due to the client or server not being able to handle the network load 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 16:17:30 +02:00
TheMode
b2a0b91a45 Add warning in PacketUtils 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 13:40:11 +02:00
TheMode
02d927cc4d Rename internal registry constant holder interfaces 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-06 13:32:52 +02:00
TheMode
f3ee80d126 Create a separate method to init & start the socket server 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 22:03:51 +02:00
TheMode
2a8719e1e4 Make collections mutable in the meta builder 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 18:48:10 +02:00
TheMode
8cbd6460f4 Cleanup... 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 03:40:30 +02:00
TheMode
026550ac07 Simplify PacketUtils 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-05 02:50:59 +02:00
TheMode
7b8277b6be Do not flip the buffer inside #write(ByteBuffer) 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 23:56:27 +02:00
TheMode
885be567fa Avoid slice allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 19:50:09 +02:00
TheMode
d21414c146 Handle prepared buffer being bigger than the pooled ones 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 19:30:18 +02:00
TheMode
f717279adc Independent socket send & receive buffer size 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 16:43:45 +02:00
TheMode
96bfc4c6fa Add getters for chunk coordinates in Point 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 15:29:20 +02:00
TheMode
8f17d52efa Merge branch 'master' into viewable-broadcast 2021-09-04 12:27:09 +02:00
TheMode
22b0c70500 Ensure that the read buffer can contain a single full packet 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 03:40:22 +02:00
TheMode
4f382c5684 Fix tick allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 03:03:06 +02:00
TheMode
9353c56460 Fix build 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 02:25:09 +02:00
TheMode
2c1e3e4323 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-04 02:22:52 +02:00
TheMode
df92939ddd Use soft references for pooled buffers 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-04 02:20:03 +02:00
TheMode
4075272a16 Disconnection should not be synchronized on the buffer lock 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 17:27:47 +02:00
TheMode
efb39c2ece Flush cleanup & prevent double allocation 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 16:51:00 +02:00
TheMode
e19b49db55 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-03 14:01:39 +02:00
TheMode
538ef75552 Sending chunks should be thread safe 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:57:19 +02:00
TheMode
3d5ae6fe94 Pool main connection buffer 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:54:38 +02:00
TheMode
400109df0a Fix potential packet corruption 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-03 13:43:00 +02:00
TheMode
4b2bda15f5 Merge branch 'master' into viewable-broadcast 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
 2021-09-02 18:50:55 +02:00
TheMode
d4e51f562c Remove threadlocal buffer cache in ChunkDataPacket 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-02 18:44:50 +02:00
TheMode
399eb860a7 Improve performance when slow clients are connected 
Signed-off-by: TheMode <themode@outlook.fr>
 2021-09-02 15:44:36 +02:00