flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,364 Commits 1 Branch 0 Tags 92 MiB
a47d9e5334
Commit Graph

3391 Commits

Author SHA1 Message Date
madmaxoft
33dc66a4d2 RankMgr: GetAllPlayers() returns players sorted by name. 2014-09-29 22:00:14 +02:00
madmaxoft
aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
madmaxoft
30b083ed63 World: Fixed chunk generation by plugins. 
ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue.
 2014-09-29 21:34:15 +02:00
Alexander Harkness
bdb8d916c0 Fixed codestyle again. 2014-09-29 19:45:12 +01:00
Mattes D
d3c2c02b6b Merge pull request #1472 from mc-server/Ranks 
Added more cRankManager functions
 2014-09-29 20:39:13 +02:00
w00tc0d3
9628733df2 BlockStone.h: fix the codestyle 2014-09-29 19:19:17 +02:00
w00tc0d3
d5ae659da3 Tabs -> spaces 2014-09-29 17:35:30 +02:00
netchip
6127c21af9 BlockStone: drop the right cobblestone on onBreak(). 
Signed-off-by: netchip <w00tc0d3@outlook.com>
 2014-09-29 17:18:20 +02:00
Howaner
ff3a3b801d Renamed GetAllPlayers() to GetAllPlayerUUIDs() 2014-09-29 14:43:16 +02:00
Howaner
347402d20d Merge branch 'master' into Ranks 2014-09-29 14:37:01 +02:00
Julian Laubstein
f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
Mattes D
666aa1df94 Merge pull request #1473 from mc-server/NewStoneGeneration 
Added Granite, Diorite and Andesite to the NaturalPatches generator.
 2014-09-29 09:33:13 +02:00
Mattes D
a245213d81 Merge pull request #1478 from doublej472/master 
Make endermen take damage in water
 2014-09-29 08:08:14 +02:00
Jonathan Frederick
c02711633d Derp 2014-09-28 19:27:53 -07:00
Jonathan Frederick
7a61e1e604 Fix comments 2014-09-28 19:24:47 -07:00
madmaxoft
280831df26 Plugin messages: Vanilla prefixes its payloads with VarInt lengths. 2014-09-28 23:03:44 +02:00
Jonathan Frederick
126b14aa09 Make endermen take damage in water 2014-09-28 13:56:41 -07:00
madmaxoft
488c6159df Revert "1.8: Fixed plugin messages." 
This reverts commit 04ee8c43dd.
 2014-09-28 22:27:23 +02:00
madmaxoft
f8c627141a Protocol 1.8: Fixed possible crash on malformed packet. 2014-09-28 22:25:48 +02:00
madmaxoft
5a44be13b7 Fixed trailing whitespace. 2014-09-28 22:17:29 +02:00
STRWarrior
7c18681e09 Fixed compilation 2014-09-28 22:10:03 +02:00
Mattes D
1422176d13 Merge pull request #1471 from mc-server/redstoneData 
Use factory method to construct redstone simulator data
 2014-09-28 22:05:05 +02:00
Mattes D
8d55cd409e Merge pull request #1466 from mc-server/endofsupport 
Removed protocols 1.2 to 1.6
 2014-09-28 22:04:30 +02:00
STRWarrior
76e0c592ef Added Granite, Diorite and Andesite to the NaturalPatches generator. 2014-09-28 19:27:08 +02:00
Howaner
4391b3fc09 Fixed SetDefaultRank() return value. 2014-09-28 19:08:33 +02:00
worktycho
80fe8d7789 Update Chunk.cpp 2014-09-28 17:57:01 +01:00
Tycho
f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00
Howaner
63c53a8e23 cRankManager: Added ClearPlayerRanks() 2014-09-28 15:16:11 +02:00
Tiger Wang
a9243257e5 Compilation fix 2014-09-28 13:11:41 +01:00
Tiger Wang
ae36ba5d33 Compilation fix 2014-09-28 13:08:00 +01:00
Howaner
27331da017 Updated api documentation. 2014-09-28 11:17:36 +02:00
Howaner
2fb3eb3532 cRankManager: Added GetAllPlayers() and GetPlayerName() 2014-09-28 02:17:32 +02:00
Howaner
04ee8c43dd 1.8: Fixed plugin messages. 2014-09-27 23:22:26 +02:00
Tiger Wang
1f8ee70d55 Bug fix 2014-09-27 22:13:37 +01:00
madmaxoft
03791b1e63 Fixed another redstone crash. 2014-09-27 22:25:07 +02:00
Mattes D
a3b140cb44 Merge pull request #1465 from Masy98/blocks 
Added barriers correctly
 2014-09-27 22:01:55 +02:00
madmaxoft
113b54aefd BioGen: TwoLevel is now fully settable in INI. 2014-09-27 22:01:47 +02:00
Masy98
79110b29db Combined conditions 2014-09-27 21:49:03 +02:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
madmaxoft
d1a72eb6de Wrapped clang-specific pragma into an #ifdef block. 
MSVC was complaining about an unknown pragma.
 2014-09-27 21:33:50 +02:00
Masy98
fc22ba0ce8 Added barriers correctly 2014-09-27 21:07:52 +02:00
Tiger Wang
7b7225e50b Merge remote-tracking branch 'origin/master' into endofsupport 2014-09-27 19:20:02 +01:00
Tiger Wang
7ce09a9113 Suggestions 2014-09-27 19:19:28 +01:00
Tiger Wang
d1814d2d67 Merge remote-tracking branch 'origin/master' into chestcarts 
Conflicts:
	src/Entities/Minecart.cpp
 2014-09-27 18:40:00 +01:00
worktycho
cc73b70211 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:24:01 +01:00
worktycho
88a07bd184 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:19:32 +01:00
worktycho
20101fab99 Correct method name. 2014-09-27 15:04:08 +01:00
worktycho
94a0d04d58 Set chunk data 2014-09-27 14:49:03 +01:00
worktycho
4f8818748e Add data accessor. 2014-09-27 14:46:50 +01:00
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Masy98
6dd47e783a Added default value to switch and spruce gate to fence gate handler 2014-09-27 15:11:35 +02:00
Masy98
485bac2818 Fixed convertToPickups for fence gates 2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab Fixed convertToPickups for doors 2014-09-27 14:19:45 +02:00
Mattes D
305778f22f Merge pull request #1456 from Howaner/Fixes 
Fixed player custom names in 1.8 and added type checking to map loading
 2014-09-26 23:01:22 +02:00
madmaxoft
0d83477540 Fixed UNUSED macro so that it doesn't require type knowledge. 
Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables).
 2014-09-26 22:53:39 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks 
Added 1.8 Blocks and Items
 2014-09-26 22:24:45 +02:00
Howaner
af997a09ca Merge branch 'master' into Fixes 2014-09-26 22:23:36 +02:00
Tiger Wang
4e2b838a69 Merge pull request #1455 from mc-server/includes 
Removed a few unnecessary includes
 2014-09-26 19:46:43 +01:00
worktycho
02db79d725 Update Plugin.h 2014-09-26 19:00:26 +01:00
Masy98
9106a8c29b Moved curly brace to seperate line 2014-09-26 19:45:03 +02:00
Masy98
4105be0bec Re-added 1.8 blocks to the redstone simulator 2014-09-26 19:44:06 +02:00
Tycho
0e141923bb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-26 18:14:22 +01:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
tycho
ad5d0eda9c Fixed issue with casting 2014-09-26 17:00:34 +01:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Tycho
6ffb7835e7 Removed a few unnessicary includes 2014-09-26 16:26:03 +01:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests 
Added test mocking to IncrementalRedstoneSimulator
 2014-09-26 16:04:26 +01:00
Howaner
749c6092d3 Added type checking to map loading. 2014-09-26 14:31:52 +02:00
madmaxoft
157cad9007 Improved searching for spawn. 
Won't spawn on a small island inside ocean anymore.
 2014-09-26 13:04:34 +02:00
madmaxoft
6b260f06ba cByteBuffer: Simplified ReadPosition(). 
Also, by popular demand, added more comments to the code.
 2014-09-25 23:06:21 +02:00
madmaxoft
976c6bd32b Protocol 1.8: Fixed plugin message packet. 2014-09-25 21:33:20 +02:00
madmaxoft
0443f5d531 cByteBuffer: Fixed position reading. 2014-09-25 21:23:05 +02:00
madmaxoft
e5293706de TwoLevel BioGen: reads params from INI file. 2014-09-25 20:47:29 +02:00
madmaxoft
8f4cc27e39 Added cByteBuffer::WriteBEUShort(). 2014-09-25 20:47:29 +02:00
Mattes D
e751f4ffe3 Merge pull request #1452 from Howaner/Fixes 
Fixes
 2014-09-25 20:45:54 +02:00
madmaxoft
27187371eb Protocol 1.8: Handling packet compression properly. 
The compression didn't work with CommLog turned on.
 2014-09-25 20:34:49 +02:00
madmaxoft
3459bc1ede Protocol 1.8: Added checks for values presence. 
Reported by @worktycho / Coverity.
 2014-09-25 19:42:35 +02:00
Howaner
050b28741b Comment style 2014-09-25 19:28:11 +02:00
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Howaner
7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +02:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-25 17:58:12 +01:00
Howaner
12621e3800 Use the json writer to write sign texts. 
Without this change the client disconnects if the text contains "
 2014-09-25 18:49:55 +02:00
Howaner
67fe834499 Fixed dispender direction bug 2014-09-25 18:37:36 +02:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
madmaxoft
c6f78d516b Redstone: Fixed a crash with repeaters on a chunk border. 2014-09-25 18:36:11 +02:00
madmaxoft
aeabc4ff6b 1.8 Protocol: Fixed problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
a518a83c25 1.7 Protocol: fixed potential problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
843f31ecba HangingEntity: Silenced a crash. 
Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log.
 2014-09-25 18:36:09 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
32ecb121a3 derp 2014-09-24 15:30:52 +02:00
Howaner
1d588b5195 Don't create two entity lists. 2014-09-24 15:17:20 +02:00
Howaner
65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft
8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla. 
Kept the old Int reading for compatibility reasons.
Ref.: #1448
 2014-09-23 22:22:38 +02:00
Howaner
2832685c02 Merge branch 'master' into WorldLoader 2014-09-23 22:16:05 +02:00
madmaxoft
d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
madmaxoft
0b40ce971c Fixed a crash in WSSAnvil. 
Reported as #1448.
 2014-09-23 22:12:47 +02:00