flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,933 Commits 1 Branch 0 Tags 92 MiB
7102e9edb0
Commit Graph

326 Commits

Author SHA1 Message Date
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes 
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
 2014-04-18 21:44:58 +02:00
jfhumann
013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
Tiger Wang
6cb63a768d Fixed #906 2014-04-18 12:59:14 +01:00
Mattes D
b7e074b10b Merge pull request #891 from mc-server/fixes 
Fixes to redstone & general
 2014-04-17 22:37:00 +02:00
Tiger Wang
bdea8706d8 Added new AI rules 
+ Added new AI rules handling cacti and large heights
* Fixed cIniFile not recognising comments in cIniFile::ReadFile()
* Fixed users.ini not being properly generated
* Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
 2014-04-17 18:50:25 +01:00
Tiger Wang
c0c47d33c5 Entities handle chunks properly again 
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
 2014-04-12 13:16:48 +01:00
madmaxoft
143a5e61fc Fixed Endiannes conversion routines for floats and doubles. 
This bug has been introduced in 8825d30aab.
This change fixes #854.
 2014-04-05 22:34:05 +02:00
madmaxoft
d43c5a9c47 Removed debugging log from entity physics handling. 2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867 Added cPlayer:SendRotation() API function. 2014-04-05 12:09:30 +02:00
madmaxoft
e304bd08a2 Documented the units and range for entity rotations. 2014-04-03 21:44:03 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
STRWarrior
36e1e57d03 Using recommendations (I think) 2014-03-30 17:21:13 +02:00
STRWarrior
66f1bb7b67 Added a BlockHitPos parameter to OnProjectileHitBlock 2014-03-30 14:04:44 +02:00
STRWarrior
47d5395d24 Added a blockface parameter to the OnProjectileHitBlock hook. 2014-03-30 13:44:28 +02:00
Mattes D
37812813d3 Merge pull request #842 from mc-server/ProjectileHooks 
Projectile hooks
 2014-03-29 22:32:50 +01:00
STRWarrior
98a12127ce Fixed the OnProjectileHitBlock hook not stopping projectiles. 2014-03-29 17:05:24 +01:00
STRWarrior
ec4638a228 Added HOOK_PROJECTILE_HIT_BLOCK. 2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e Fixed error when the hook gets called. 2014-03-29 15:43:03 +01:00
STRWarrior
339d555111 Added HOOK_PROJECTILE_HIT_ENTITY 2014-03-29 15:26:41 +01:00
Tiger Wang
6dea7993f2 Fixed #721 and FS439 2014-03-28 23:25:11 +00:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Samuel Barney
eb3cc729d4 More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. 
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
 2014-03-25 11:15:05 -06:00
Samuel Barney
d77a6417f6 Added newlines. Without them, the files would not compile. 2014-03-25 10:33:52 -06:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069 Rewritten player speeds to be relative unit-less. 
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
 2014-03-20 15:45:42 +01:00
Tiger Wang
a0720a65d6 Minor Entity.cpp cleanup 2014-03-19 23:07:16 +00:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt 
Conflicts:
	src/ChunkMap.cpp
 2014-03-18 20:49:08 +00:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds 
Beds now work properly, fixes #707
 2014-03-16 21:47:34 +01:00
Howaner
8316ae330e Merge branch 'master' into BlockEntitys 2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91 Add item frame saving. 2014-03-15 02:45:25 +01:00
Howaner
cf13739288 Add health and age load to pickup's. 2014-03-15 00:43:38 +01:00
Howaner
28898f710b Add ExpOrb saving. 2014-03-15 00:32:49 +01:00
madmaxoft
f2df33f746 Merge remote-tracking branch 'xdot/master' 2014-03-12 14:42:04 +01:00
madmaxoft
392fb7923b Merge remote-tracking branch 'origin/SnowBall' 2014-03-12 08:41:33 +01:00
andrew
9810d57a39 Unified Matrix4 code 2014-03-11 18:33:31 +02:00
STRWarrior
ef3c5a97a4 TakeDamage now has the cThrownSnowballEntity instead of the creator's object. 2014-03-11 16:24:05 +01:00
STRWarrior
deafec874d Snowballs now actualy hurt other entities. 
3 damage for blazes and 1 for the ender dragon. Otherwise 0
 2014-03-11 15:14:47 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt 
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-03-10 18:59:11 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys 
Add TNT load/save
 2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e Merge pull request #731 from mc-server/ballisticmissiles 
Ballistic firework missiles
 2014-03-09 21:43:15 +00:00
Tiger Wang
3aff0b44bc Fixed #778 - stack overflow.com 2014-03-09 17:51:02 +00:00
Tiger Wang
b64e9fb7f5 Beds now work properly fixes #707 
Also fixes FS392

Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
 2014-03-09 15:32:34 +00:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles 
Conflicts:
	src/ClientHandle.cpp
 2014-03-09 12:53:50 +00:00
Tiger Wang
c05a1db88d CheckBlockInteractionsRate() fixed & enabled 2014-03-09 12:48:52 +00:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
Tiger Wang
53231bebd6 Added extra awesomeness to TNT 
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
 2014-03-05 22:12:48 +00:00
andrew
d73cdba1f6 g_BlockXXX => cBlockInfo::XXX 2014-03-01 21:34:19 +02:00
andrew
692a84af31 Shortened enums 2014-03-01 14:20:29 +02:00
andrew
5c44945287 Exported and documented cScoreboard 2014-03-01 12:08:40 +02:00
madmaxoft
1826461884 Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
madmaxoft
35def963f0 Moved common cGroupManager code to a separate function. 
This fixes my concerns in PR #709.
 2014-02-28 15:31:20 +01:00
Mattes D
6ad4b78a7b Merge pull request #709 from Howaner/GlobalFixes 
Add 'Group not found', when the Server load the users.ini and add auto g...
 2014-02-28 14:28:50 +01:00
Tiger Wang
9ac9249aca Removed unneeded includes in Player.cpp 2014-02-27 21:49:10 +00:00
Tiger Wang
baf2d88921 Implemented ballistic missiles (fireworks) 
+ Added fireworks
 2014-02-26 23:33:52 +00:00
STRWarrior
145b3492e7 Small improvements to boats. 2014-02-24 12:58:57 +01:00
Howaner
3777873f22 Remove users.ini generation in Player.cpp and use the CheckUsers() Function 2014-02-21 15:10:31 +01:00
Howaner
21febaf4b3 Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini 2014-02-21 14:53:46 +01:00
andrew
83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Tiger Wang
a686656253 Merge branch 'master' into itemframes 
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
 2014-02-18 22:13:44 +00:00
Tiger Wang
05789f9e66 Changed BlockFace type to eBlockFace 2014-02-18 21:33:33 +00:00
Tiger Wang
d5ee899d0e Added a brace 
====
{       }
{  __  }
{  | |  }
====

REMOVE ALL THE BRACES!!
 2014-02-18 11:44:09 +00:00
Tiger Wang
6788dbe7f2 Properly exported and documented paintings 2014-02-18 11:37:45 +00:00
Tiger Wang
320cc74f0a Implemented paintings, fixes #689 
+ Implemented paintings
 2014-02-18 00:16:03 +00:00
Tiger Wang
464ec47eb7 Implemented item frames, a part of #689 
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
 2014-02-17 23:00:03 +00:00
andrew
3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
madmaxoft
ea55a22a71 Links sent via chat messages are clickable. 
Fixes #658.
 2014-02-16 23:51:32 +01:00
Tiger Wang
4908b6f500 Fixed minor formatting issues from #682 
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
 2014-02-16 13:37:36 +00:00
Howaner
707916b404 Replace random Float Generation and broadcast the Exp Pickup Sound 2014-02-16 01:25:39 +01:00
Howaner
f3bd288f02 Add Exp Bottle Effects 2014-02-16 01:19:30 +01:00
Howaner
d15d6acc58 Disable Hunger Death 2014-02-16 01:18:10 +01:00
madmaxoft
0f1f7583ae Implemented cCompositeChat. 
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678.
 2014-02-15 23:17:49 +01:00
Alexander Harkness
584f7bd806 Merge pull request #679 from mc-server/NotchDeath 
NotchApple
 2014-02-15 19:04:13 +00:00
STRWarrior
0040a88b9b If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch 2014-02-15 19:51:05 +01:00
Tiger Wang
91ebb6cef0 Made player jump reset less ambiguous 2014-02-12 21:53:46 +00:00
Tiger Wang
06239c8336 Fixed #627 
- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
 2014-02-11 22:09:56 +00:00
Tiger Wang
9d1c9097e3 Merge remote-tracking branch 'origin/master' into playerimprovements 
Conflicts:
	src/Root.cpp
	src/Root.h
	src/World.cpp
 2014-02-09 00:14:42 +00:00
Tiger Wang
f86f066615 Merge branch 'master' into playerimprovements 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-02-09 00:04:42 +00:00
Tiger Wang
14b5054c95 Fixed a boat ASSERT 2014-02-08 23:02:50 +00:00
Tiger Wang
88a64ec40d Improved chat messaging functions 
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
 2014-02-07 18:58:52 +00:00
Tiger Wang
aa8b46e947 Server internally uses new functions 2014-02-05 23:24:16 +00:00
Tiger Wang
3450f0ca42 Added more chat functions 2014-02-05 23:24:02 +00:00
Mattes D
cd634ea138 Merge pull request #649 from mc-server/GroupsPermissions 
Removed deprecated HasCommand function
 2014-02-05 21:07:10 +01:00
STRWarrior
89ec774fd6 Removed deprecated HasCommand function 2014-02-05 20:20:11 +01:00
Tycho
8ba6f73169 Fixed most of the reordering warnings 2014-02-05 09:43:49 -08:00
Tiger Wang
ea2ce1595f Fixed annoying creative on fire bug 2014-02-04 23:27:13 +00:00
Tiger Wang
9eeeb91fa6 Added more SendMessageXXX() functions 2014-02-04 22:39:57 +00:00
Tycho
8464f689ea Improved Type safety of eBlockFace 
May Fix #640
 2014-02-04 10:59:05 -08:00
Tiger Wang
01c723e89e Pickup constructor no longer exported 
It didn't do anything without Initialize() exported, anyway, pickups are
spawned with cWorld.
 2014-02-03 22:51:26 +00:00
Tiger Wang
3583a58cf7 Added SendMessageXXX() to cPlayer 
As requested by @bearbin, one no longer needs to download a file that
links to Core. The server does it! Hopefully this encourages standards
compliance.
 2014-02-03 22:46:56 +00:00
Tiger Wang
6de8c09fe0 Fixed a crash bug 2014-02-03 22:24:22 +00:00
Tiger Wang
a3759c1462 Merge remote-tracking branch 'origin/master' into playerimprovements 2014-02-03 21:25:42 +00:00
Tiger Wang
b5e898a608 Server now handles join messages also 
* Revised as well hook documentation
 2014-02-03 21:12:44 +00:00
Mattes D
b090547c17 Merge pull request #602 from mc-server/improvementsandfixes 
Redstone crash fix and current console line replace function
 2014-02-02 22:02:25 -08:00
Tiger Wang
b89419f603 Creative players take Plugin damage 2014-02-02 12:47:17 +00:00
Mattes D
33759197e9 Merge pull request #585 from daniel0916/hooks 
Added "player destroying" and "player destroyed" hooks
 2014-02-01 05:08:08 -08:00
daniel0916
dbbd47b96d Removed "player destroying" hook 2014-02-01 13:27:44 +01:00
STRWarrior
5e3f7947ae Removed debug message when a firework entity hit a solid block. 2014-01-29 13:28:08 +01:00
STRWarrior
374034e615 Bottle o' Enchanting spawns an experience orb. 2014-01-29 13:27:03 +01:00
Mattes D
09ee8a1bb6 Merge pull request #589 from mc-server/minecartimprovements 
Minecart improvements
 2014-01-26 05:13:54 -08:00
Tiger Wang
398e159f5f Rail speed tweak 2014-01-25 20:33:23 +00:00
Tiger Wang
6fa3a0cf70 Two minor changes 2014-01-25 19:05:44 +00:00
Tiger Wang
7468ba0f10 Implemented fall damage for mobs 
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
 2014-01-25 19:02:13 +00:00
Tiger Wang
d9707a9291 Implemented pickup combining 
* Fixes FS393
* Part of  #131
 2014-01-25 15:19:56 +00:00
daniel0916
bac750b24e Added "player destroying" and "player destroyed" hooks 
Hooks:
HOOK_PLAYER_DESTROYING
HOOK_PLAYER_DESTROYED

Idea from: https://github.com/mc-server/MCServer/issues/473
 2014-01-25 11:25:22 +01:00
Tiger Wang
fd7fc7e59e All mobs now drown (fixes #54) 
* Implemented mob drowning
* Iron Golems and squids are excluded
 2014-01-24 23:58:51 +00:00
Tiger Wang
a988063915 Miscellaneous improvements 2014-01-24 21:55:04 +00:00
Tiger Wang
2ce26574ef Removed unused ReferenceManager 2014-01-24 19:46:45 +00:00
Tiger Wang
f39daabf7e Added more minecart powered rail directions 2014-01-24 19:39:39 +00:00
madmaxoft
b02940209d Fixed crash with failed entity-loading. 
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
 2014-01-24 09:57:12 +01:00
madmaxoft
8a254faaf7 Merge remote-tracking branch 'MikeHunsinger/master' 2014-01-24 08:55:41 +01:00
Mike Hunsinger
7c12247263 Fixed indentation once and for all. 2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8 Fixed indentation and doxygen comments... For real this time. 2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b Fixed spacing and doxycomments. 2014-01-23 19:54:00 -07:00
Mike Hunsinger
41b05416c7 Split TossItem into three Toss functions (Held, Equipped and Pickup) 2014-01-23 00:27:39 -07:00
tonibm19
d59a0156ce Fixed compilation on VC2008 2014-01-22 16:58:25 +01:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
andrew
7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
Tiger Wang
83cbe8c139 Begin implementing ascending rails 2014-01-19 19:31:17 +00:00
Tiger Wang
3700ad8546 Added one more direction into collision checks 
* Added direction XM_XP
* Improved performance, thanks STR and xoft
 2014-01-19 18:42:05 +00:00
Tiger Wang
9a580146e4 Minecart improvements and fixes 
* Fixed curved rails
* Fixed detector rails in certain situations
* Fixed powered rails and others passing bad meta to SnapToRail()
 2014-01-19 18:27:06 +00:00
Tiger Wang
8467f5dfae Added more rail functionality 2014-01-19 14:52:45 +00:00
andrew
f321b5d224 Scoreboard improvements 2014-01-19 16:02:37 +02:00
Tiger Wang
82b2290b74 Merge remote-tracking branch 'origin/master' into minecartimprovements 2014-01-19 13:55:22 +00:00
andrew
2b94361059 Basic scoreboard implementation 2014-01-19 14:20:57 +02:00
STRWarrior
24df625fbd Exported cFloater to the Lua API. 2014-01-19 00:04:46 +01:00
Tiger Wang
ddd03a050b Minecart collision and general improvements 
+ Implemented collision on one type of rail
* Improved curved rails somewhat
* Fixed a crash bug
 2014-01-18 20:58:26 +00:00
Mattes D
79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart 
Added cWorld::SpawnMinecart.
 2014-01-17 02:27:56 -08:00
madmaxoft
aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
madmaxoft
ed1d336614 Merge remote-tracking branch 'origin/customnames' 2014-01-17 10:44:23 +01:00
madmaxoft
de4ac55398 Disabled excessive entity-related logging in Debug mode. 2014-01-16 20:31:06 +01:00
Tiger Wang
74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
STRWarrior
ca835a0565 Changed GetContent function. 2014-01-16 16:54:22 +01:00
Tiger Wang
f3baf31563 OBSOLETE'd obsolete functions 2014-01-15 22:38:15 +00:00
Tiger Wang
3c31f2d8d8 Implemented Ctrl-Q drop stack 
Also fixed an issue with TossItems not respecting count.
 2014-01-15 22:36:19 +00:00
STRWarrior
72dcd70f22 Furnace minecarts now stop being active after a while. 2014-01-15 14:38:54 +01:00
STRWarrior
bdfe31f917 First implementation for furnace minecarts. 2014-01-15 14:03:09 +01:00
Tiger Wang
e3b839b69f Yes newline at end of file :D 2014-01-14 18:16:13 +00:00
Tiger Wang
a66e154b90 Final improvements to Minecarts 
* Fixed curved rails being a little broken
+ Implemented detector rails
+ Implemented block collisions on rails
* Fixed snapping to rail
- Removed minecart physics conditions in Entity.cpp as minecarts use
their own simulator when on rails

Fixes #148 and #217; partially implemented #215.

This is Cave Johnson, and we're done here.
 2014-01-13 22:37:09 +00:00
Tiger Wang
edefa27a48 Detaching improvements 
* Players now search for an area around themselves to teleport to when
detaching from something
 2014-01-12 23:23:36 +00:00
STRWarrior
c7d556afaf Fixed server crash. 2014-01-12 18:15:54 +01:00
STRWarrior
f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
STRWarrior
c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
Tiger Wang
ec6c510bd4 Multiple enhancements and fixes to minecarts 
+ They are destroyed instantly by creative mode
* Physics is much improved
+ Basic implementation of powered rails
 2014-01-12 13:28:37 +00:00
Morgan Redshaw
782818ffb5 Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. 2013-12-30 21:30:20 -07:00
madmaxoft
ee15d4e08e Fixed compilation in VC2008. 
Also removed an unused inline header file (yuck).
 2013-12-30 17:41:59 +01:00
Tycho Bickerstaff
d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00