flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
2,746 Commits 1 Branch 0 Tags 92 MiB
293051eca8
Commit Graph

1993 Commits

Author SHA1 Message Date
Samuel Barney
e6ace0e4f2 More documentation. 2013-11-05 14:19:49 -07:00
madmaxoft
6bd30954c5 Clarified cBlockHandler::ConvertToPickups() dox. 2013-11-05 22:19:46 +01:00
Tiger Wang
a263dc8e83 Implemented suggestions 
- 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-05 21:15:39 +00:00
Samuel Barney
5d353fd8f8 Added missing check for a_LineOfSight 2013-11-05 14:13:12 -07:00
Samuel Barney
eefc6d37ef cTracer can now handle mob sight. 2013-11-05 14:11:13 -07:00
Samuel Barney
9d5d74d826 Added more documentation. Changed cTracer::Trace to return a bool instead of an int because it was only returning 1 or 0 anyways. 2013-11-05 14:01:51 -07:00
madmaxoft
e2e948015e Protocol 1.7: More client-bound packets. 
Also removed the SendWholeInventory(cInventory &) function, as promised in prev commit.
 2013-11-05 18:37:57 +01:00
madmaxoft
88472b7ce6 Removed the obsolete SendWholeInventory(cInventory &) function. 
This won't compile because there's still a change in Protocol17x.cpp pending; the next commit will fix this.
 2013-11-05 18:37:57 +01:00
Mattes D
e65ce13012 Merge pull request #307 from mc-server/MobImprovements 
Mob projectiles
 2013-11-05 08:22:31 -08:00
Samuel Barney
e37531fe01 Moved cTracer::SetValues to be an internal function because it is only ever used in cTracer::Trace. 
Removed SetValues from Bindings.cpp.
Added some commenting to explain what each function does in cTracer.
 2013-11-05 09:22:28 -07:00
STRWarrior
c84bd79eff Fixed indentation. 2013-11-05 16:24:54 +01:00
Samuel Barney
b23047f47b Reworked collision to use g_BlockIsSolid 2013-11-04 20:10:29 -07:00
Samuel Barney
96ef6084ae Flowers, mushrooms and air are no longer collidable. 2013-11-04 17:14:49 -07:00
Tiger Wang
0c2c803a16 Removed settings/webadmin.example.ini files 
Additionally, added some default plugins to autogeneration. Also moved
nbt examples to docs/NBT Examples.
 2013-11-04 22:06:23 +00:00
Tiger Wang
e832736e0b Autogeneration of settings.ini and webadmin.ini 
Fixes issue #75
 2013-11-04 21:51:24 +00:00
STRWarrior
7cfcfc5f39 Skeleton, Ghast and Blaze's projectile code is now in their respective class. 2013-11-04 21:46:56 +01:00
madmaxoft
d47a8ea008 Protocol 1.7: Added more client-bound packets. 
Untested, still more to come.
 2013-11-04 21:20:36 +01:00
madmaxoft
3002dc8bbf Protocol 1.7: Added client status packet. 2013-11-03 21:34:46 +01:00
Mattes D
7c60ad4856 Merge pull request #306 from tigerw/master 
Flipped some variables in Portals
 2013-11-03 09:06:15 -08:00
madmaxoft
9b84d68d27 Protocol 1.7: Rewritten packet-sending to use cPacketizer. 
Implemented enough of the protocol that the client now spawns in the world (but cannot do anything).
 2013-11-03 11:59:07 +01:00
madmaxoft
dacd6a5274 cByteBuffer: Fixed GetUsedSpace() off-by-one error. 2013-11-03 11:59:07 +01:00
madmaxoft
53c31ee1cd ClientHandle: Fixed an error in player-joining hook. 
Players being disconnected used to fire the PlayerJoined hook repeatedly.
 2013-11-03 11:59:07 +01:00
madmaxoft
9bdc94053e Added cEntity:GetYaw() and cEntity:SetYaw(). 
This is the preferred way to get / set rotation, GetRotation() and SetRotation is obsoleted due to bad name.
 2013-11-03 11:59:05 +01:00
madmaxoft
7dc96f0441 Added cPlayer::GetEffectiveGameMode(). 2013-11-03 11:59:05 +01:00
STRWarrior
6f0f620cf8 Skeleton.cpp doesn't have to load ProjectileEntity.h and Entity.h. 2013-11-02 21:32:55 +01:00
STRWarrior
58ced0c12c Skeletons, Blazes and Ghasts now shoot their projectile to the target. 2013-11-02 20:47:43 +01:00
STRWarrior
3dc3e5eca7 Zombies and Skeletons don't walk into the sun anymore. 2013-11-02 20:45:51 +01:00
Tiger Wang
5bd9eb6a1f Flipped some variables in Portals 
To make them work on the X axis.
 2013-11-02 19:04:38 +00:00
Mattes D
56c97d6c30 Merge pull request #303 from tigerw/bugfixes 
Nether portal creation
 2013-11-02 09:10:18 -07:00
Tiger Wang
f38375a2ec Fixed bow damage in creative 
Also reverted indenting change
 2013-11-02 16:01:40 +00:00
Tiger Wang
96cd7d65a3 Fixed dropspensing speed and position 2013-11-02 14:09:07 +00:00
Tiger Wang
77b3db7e25 Multiple fixes 
* Fixed #282
* Fixed bow not taking damage
* Enhanced Player.cpp code
 2013-11-02 14:08:00 +00:00
Tiger Wang
b731dd0635 Split border finder into separate function 2013-11-02 13:50:30 +00:00
Tiger Wang
585f01c3f6 Implement suggestions 
- Removed unneeded parameter
* Changed 0 -  1 to -1
 2013-11-02 12:29:26 +00:00
Tiger Wang
72ec10f26d Readded BlockPortal.h (portals) 2013-11-02 00:50:03 +00:00
Tiger Wang
7913a2dcdb Fixed compile error (portals) 
WITH A FULL REFORK
 2013-11-02 00:44:09 +00:00
madmaxoft
b6faeaba18 Protocol 1.7: Implemented the first batch of sent packets. 2013-11-01 16:20:15 +01:00
madmaxoft
db190a627c Merge branch 'master' of https://github.com/mc-server/MCServer 2013-11-01 11:17:37 +01:00
madmaxoft
62d27e4ed9 Merge branch 'griefer'sdelight' of git://github.com/tigerw/MCServer. 2013-11-01 11:14:55 +01:00
madmaxoft
7a77986d88 Protocol 1.7: Added skeleton functions for reading client packets. 
Untested, this is skeleton code only.
 2013-10-31 23:48:43 +01:00
madmaxoft
080ee3b2a1 ByteBuffer: Writing a string doesn't modify it (missing const). 2013-10-31 23:47:22 +01:00
Mattes D
4124ed3ef9 Merge pull request #302 from SamJBarney/master 
Broken rail blocks now stack.
 2013-10-31 05:58:02 -07:00
Samuel Barney
d85a2a1c2f Adhering to project standards. 2013-10-31 06:19:06 -06:00
Samuel Barney
47697b2667 Added missing conventions for windows. 2013-10-30 19:09:12 -06:00
Samuel Barney
e2ef23fa5f Broken rail blocks now stack. 2013-10-30 16:58:18 -06:00
madmaxoft
feaea31b78 Protocol 1.7: Added status ping handling. 2013-10-30 23:38:55 +01:00
madmaxoft
f490d3d1e7 Fixed a compiler warning. 
Also updated code to match our style.
 2013-10-30 23:33:42 +01:00
Mattes D
8b9d3c7722 Merge pull request #292 from SamJBarney/MobSpawning 
Mob Spawning based on light values
 2013-10-30 15:25:51 -07:00
madmaxoft
dab398d5d6 Added 1.7 to protocol recognizer. 
The 1.7 protocol currently only reports server description and playercount.
 2013-10-30 23:24:46 +01:00
Samuel Barney
7157c392fa Last of the nitpicker note fixes. Added some inline commenting. 2013-10-30 16:14:42 -06:00
Mattes D
9497e11ad4 Merge pull request #301 from SamJBarney/master 
Grass no longer grows under water, and water on top kills it.
 2013-10-29 14:32:31 -07:00
Mattes D
a0c2981a3c Merge pull request #299 from tonibm19/master 
Saddles are dropped, chicken spawn out of thrown eggs.
 2013-10-29 14:03:49 -07:00
Samuel Barney
f2e17981c5 Grass no longer grows under water, and water on top kills it. 2013-10-29 14:49:15 -06:00
STRWarrior
52d956ccf3 Changed GameMode() == 1 to IsGameModeCreative in AggressiveMonster.cpp and ClientHandle.cpp 2013-10-29 21:45:31 +01:00
STRWarrior
0384c54676 Fixed bug where creative inventory didn't work. 2013-10-29 21:19:06 +01:00
Samuel Barney
e94307c292 Changes based on madmaxoft's nitpicker notes. 2013-10-29 12:43:41 -06:00
Samuel Barney
e1a06153b2 Update to allow the light map to remain the same, but allow alteration of sky light values based on time. 2013-10-29 10:44:51 -06:00
tonibm19
e96c1aebfe Using tabs 2013-10-29 16:44:45 +01:00
Samuel Barney
d7a490a992 Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning 2013-10-28 16:40:13 -06:00
Samuel Barney
47283f9daa Got spiders and other mobs respecting night and day for spawning 2013-10-28 16:38:34 -06:00
tonibm19
8a6511d329 fixed indentation 2013-10-28 21:45:49 +01:00
tonibm19
b26acdb9db extra line 2013-10-28 21:41:43 +01:00
tonibm19
669beef2de attempt at fixing indentation 2013-10-28 21:37:45 +01:00
tonibm19
b182f25324 Extra line 2013-10-28 21:00:14 +01:00
tonibm19
1841d77952 Fixed indentation 2013-10-28 20:58:50 +01:00
tonibm19
8c9fa9cf35 Added random chicken spawn when throwing an egg 2013-10-28 20:57:04 +01:00
madmaxoft
dfefdcf7f1 MC uses VarInts only up to 32-bits. 2013-10-28 20:57:03 +01:00
madmaxoft
c9b6c3bc2e cByteBuffer: Added the VarInt and VarUTF8String type reading and writing. 
This implements #296.
 2013-10-28 20:40:55 +01:00
tonibm19
1ff051c9a3 Now saddled horses spawn a saddle pickup when killed 2013-10-28 20:28:16 +01:00
tonibm19
5a723454a9 Now saddle pigs spawn a saddle pickup when killed 2013-10-28 20:27:05 +01:00
madmaxoft
1eac38f3d7 Fixed indentation in tonibm19's code. 2013-10-28 19:54:03 +01:00
Mattes D
65b43604a5 Merge pull request #294 from tonibm19/patch-3 
Correct wool drops when shearing a sheep.
 2013-10-28 11:51:46 -07:00
tonibm19
984277f65e Fixed compilation 
STR_Warrior code had an error (I copied&pasted it before)
 2013-10-28 19:47:38 +01:00
tonibm19
6e554c3b52 Use STR_Warrior code and changed variable name 2013-10-28 19:42:02 +01:00
Samuel Barney
16bac5ace9 Made mob spawning code use the chunk so that it could use varying sizes of areas for different mobs. 2013-10-28 09:49:06 -06:00
madmaxoft
df20c19986 Renamed cWindow constants to include the "wt" prefix. 2013-10-28 13:30:24 +01:00
tonibm19
144b528257 Extra line 2013-10-27 10:42:16 +01:00
tonibm19
a42561cf5a Sheep fixes. 
Now amount of wool you get when shearing a sheep is random.
Sheeps only spawn in white color (I will add sheep dying soon).
 2013-10-27 10:41:25 +01:00
madmaxoft
3fa03e854f Added cChunk::UnboundedRelGetBlockLights(). 
This queries both BlockLight and SkyLight for the specified block.
 2013-10-27 09:19:13 +01:00
madmaxoft
a7d44d69dd Authenticator doesn't save the ini file. 
Didn't load it -> shouldn't save it.
 2013-10-27 09:09:39 +01:00
madmaxoft
f032a2ff74 Merge branch 'origin/LoadWorlds/cAuthenticatorINI' 2013-10-27 09:04:39 +01:00
STRWarrior
cb06f35cb8 Changed "cIniFile IniFile" to cIniFile & IniFile" 2013-10-26 19:47:12 +02:00
madmaxoft
52f88b9595 Merge branch 'IniFileCleanup' 2013-10-26 19:43:34 +02:00
STRWarrior
77661f4c59 Both the LoadWorlds() function and cAuthenticator now use the cIniFile object from the Root::Start() function. 2013-10-26 17:08:28 +02:00
Samuel Barney
6c30ce93da Disabling Endermen and spiders until I rework the CanSpawnHere to take a chunk and a position. 2013-10-26 03:51:56 -06:00
Samuel Barney
0b853dca93 Moving spawning position to the center of the block. 2013-10-26 03:50:34 -06:00
Samuel Barney
6f0d15b448 Checked Endermen; they work; adding them back in. 2013-10-25 12:15:10 -06:00
Samuel Barney
4e024f5d87 Fixed mob spawning so that hostile mobs will not spawn incorrectly. 2013-10-25 11:50:46 -06:00
madmaxoft
323ebf119f cIniFile: Renamed functions to make meaning more explicit. 
For example KeyComment() -> GetKeyComment() / AddKeyComment()
 2013-10-25 11:38:14 +02:00
madmaxoft
9e9198e090 cIniFile doesn't store filename internally anymore. 2013-10-25 11:15:44 +02:00
madmaxoft
86bec4c57c cMonster: Improved doxycomments. 2013-10-25 10:41:19 +02:00
madmaxoft
5331555708 Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). 2013-10-24 16:45:13 +02:00
madmaxoft
99d369d837 cPickup cleanup. 2013-10-24 16:44:25 +02:00
madmaxoft
625c5f86de Fixed cPickup's constructor's parameter naming. 2013-10-24 15:05:23 +02:00
madmaxoft
eca6955a2d Cleanup in cPlayer. 2013-10-24 12:24:40 +02:00
madmaxoft
d359c5a2fe Unified cPlayer's Heal() function with cEntity's. 2013-10-24 12:24:39 +02:00
Alexander Harkness
54f5f71c9a Merge pull request #286 from tigerw/pickupdelay 
Pickups now have collection delay when vomited
 2013-10-23 23:36:25 -07:00
Samuel Barney
00480a1d9a Using provided UnboundedRelGetBlockBlockLight and UnboundedRelGetBlockSkyLight. 2013-10-23 17:51:14 -06:00
Samuel Barney
4666c1bf30 Merge branch 'master' of https://github.com/SamJBarney/MCServer into MobSpawning 2013-10-23 17:41:36 -06:00
Samuel Barney
f558f3c6d2 Removed my hackish Light functions 2013-10-23 17:41:24 -06:00