SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität
1.632 Commits 4 Branches 1 Tag 296 MiB
e786f4635b
Commit graph

1126 Commits

Autor SHA1 Nachricht Datum
Zach Brown
c9daa16dac Update from upstream SpigotMC 
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
 2014-12-05 21:33:40 -06:00
Zach Brown
2a30a76ac5 Merge with Spigot 
da32fe1d549 <- Increase max scoreboard objective size
 2014-12-03 18:13:06 -06:00
Zach Brown
c55b9c30d7 Update from upstream SpigotMC 
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
 2014-12-02 00:02:15 -06:00
Zach Brown
19972e09b8 Update SpigotMC's patches 
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
 2014-11-30 16:16:48 -06:00
Zach Brown
1c49ff69f4 Update Spigot's Patches round 2? 
The hell happened here.
:
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(
 2014-11-28 18:06:26 -06:00
Zach Brown
06c1cf41ab Update Spigot's Patches 
Fix Build 2339ac14a8e
Regen the patches 89d3fcbdfaf

This new system breaks a lot :(
 2014-11-28 18:03:01 -06:00
Zach Brown
de86706b70 Update PaperSpigot to Minecraft 1.8 2014-11-28 15:01:21 -06:00
Zach Brown
4100c7f703 Add Spigot binary patch 20141113a 2014-11-28 14:19:09 -06:00
Byteflux
2a92d3a54a Update with more Spigot binary patches 2014-11-28 14:19:09 -06:00
Byteflux
1a6b7c9d79 Update with latest patches from upstream SpigotMC 2014-11-28 14:19:08 -06:00
Zach Brown
cdbc7da18f Update 1.8-proto from upstream SpigotMC 
Default to integer instead of hearts to match 1.7 behavior SpigotMC/Spigot@dd5ae56242
Add a tab header / footer packet for use by plugins SpigotMC/Spigot@16a1f257e8
Fix an error with particle handling and add the new 'mobappearance' p... SpigotMC/Spigot@39fdf43ae7
Use correct length when converting maps to 1.8 wire format SpigotMC/Spigot@416bbd0a32
Add title packet for use by plugins SpigotMC/Spigot@a1570f68e5
 2014-11-28 14:19:08 -06:00
Zach Brown
9a517de244 Update 1.8-proto from upstream SpigotMC 
Fix ProtocolLib compatibility. SpigotMC/Spigot@710eb7514b
Bump protocol to 1.8 SpigotMC/Spigot@dd01fbe415
Merge the Protocollib fix into the snapshot branch SpigotMC/Spigot@8ff46693f6
Correctly send the MC|Brand packet SpigotMC/Spigot@0e0982d98c
Block EchoPet as it causes client crashes with the 1.8 patch SpigotMC/Spigot@480804b38f
Replace invalid items for 1.8 clients with (kinda) sane replacements SpigotMC/Spigot@892c121ff1
Fix the furnace progress bars for 1.8 clients SpigotMC/Spigot@a799b4d5ea
 2014-11-28 14:19:08 -06:00
Zach Brown
15b553bed3 Update from upstream SpigotMC 
Fix double plants having the incorrect top half SpigotMC/Spigot@377b69d787
Fix boats thinking that they were always on land for 1.8 clients SpigotMC/Spigot@4a083f819e
Correct the action used in updateGamemode. this isn't used by the ser... SpigotMC/Spigot@face904a9a
Allow the updated version of protocollib to be enabled SpigotMC/Spigot@4614a615cc
 2014-11-28 14:19:07 -06:00
Zach Brown
cab333b217 Rebase (Update) from upstream SpigotMC 
Don't send requests of every player was found in the global api cache SpigotMC/Spigot@841270ff1e
Correctly set the response code for the cached lookups and return the ... SpigotMC/Spigot@f170b7899c
Don't try and re-set the global api cache on reload SpigotMC/Spigot@b410a00a66
Use a compile time sneaky throw hack. SpigotMC/Spigot@508462b96b
Fix a missed rename in WorldGenGroundBush SpigotMC/Spigot@0614d8fae9
 2014-11-28 14:19:07 -06:00
Zach Brown
495c399ff4 Add Spigot's 1.8 protocol patch - Update from upstream 
Add support for Minecraft 1.8.x SpigotMC/Spigot@b15ae91145
Skip loading of ProtocolLib SpigotMC/Spigot@508ec8f573
Apply the block fix to block change packets SpigotMC/Spigot@b9349e416d
Blacklist Orebfuscator as well. SpigotMC/Spigot@b2ba105762
 2014-09-01 14:11:02 -05:00
Zach Brown
c777f40058 Update from upstream SpigotMC 
Add unbreakable API to item meta SpigotMC/Spigot@b1af008222
Configure how often EntityHangings calculate if they should die. SpigotMC/Spigot@ac6e1fc32d
Copy ItemStacks in DataWatcher to prevent ConcurrentModificationExcep… SpigotMC/Spigot@2af28ffbd1
Add the spigot.yml into the timings paste SpigotMC/Spigot@d61f38bd58

Note: This commit moves the entity-hanging tick into Spigot's spigot.yml and out of our paper.yml
 2014-08-25 16:33:18 -05:00
Zach Brown
f7bb4ad8a3 Update from upstream SpigotMC 
Included Commits:
Update IRC channel to irc.spi.gt SpigotMC/Spigot@a791c555e7
Remove inv close patch for now SpigotMC/Spigot@a3abb3bea9
Limit TNT Detonations per tick SpigotMC/Spigot@8f9c601aed
Use sane default config values SpigotMC/Spigot@1cbbb9b62e

These commits were not included as they were quickly reverted:
Only close if we are actually placing a block SpigotMC/Spigot@ea0b1b2d67
Revert for the above SpigotMC/Spigot@28faa0bd20
Add isUnbreakable and setUnbreakable to ItemMeta. Also fixes a bug wh... SpigotMC/Spigot@32e6d74a5f
Revert for the above SpigotMC/Spigot@4b5a26b11c
 2014-08-24 02:40:45 -05:00
Zach Brown
e33fc912a7 Update from upstream SpigotMC 
Skip invalid enchants in CraftMetaItem SpigotMC/Spigot@542e0798da
 2014-08-19 13:40:15 -05:00
Zach Brown
5b4bc3081a Update from upstream SpigotMC 
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
 2014-08-18 10:43:17 -05:00
Zach Brown
a4647a8a71 Update from upstream SpigotMC 
Fix empty `ench` tags being wiped by the meta system SpigotMC/Spigot@cc9a1a417f
Add Hunger Config Values SpigotMC/Spigot@2cd515e224
Make debug logging togglable SpigotMC/Spigot@d31b1d616f

Spigot has implemented a system of hunger exhaustion similar to ours, as such a lot of config values have been moved there.
Our exhaustion patch has been trimmed and only a few values for exhaustion remain in paper.yml, the others now sit in spigot.yml
 2014-08-17 16:47:36 -05:00
Zach Brown
d301626815 Update from upstream SpigotMC 
Fix Corrupted Trapped Chests SpigotMC/Spigot@08de30ca3e
Don't time async events SpigotMC/Spigot@c3a9e71da3
 2014-08-15 14:35:58 -05:00
Zach Brown
174855f19d Update from upstream SpigotMC 
Part revert to fix (0) in place of file name SpigotMC/Spigot@2fbc1f2704
Fix the last PR SpigotMC/Spigot@b2199df3f7
 2014-08-11 15:49:06 -05:00
Zach Brown
3727c00bdd Update from upstream SpigotMC 
Abridged: Force close player inventories when they move/interact
This prevents modified clients from using the 2x2 crafting square as permanent storage

Force Close Inventory On Move SpigotMC/Spigot@db78a70788
Only close once, if needed SpigotMC/Spigot@b652de8e7f
Move to interact event closing SpigotMC/Spigot@b5378850d3
Disregard arm swings - racy SpigotMC/Spigot@f86634e280
 2014-08-10 00:21:18 -05:00
Zach Brown
8e365012c0 Update from upstream SpigotMC 
Upstream Merge (Bukkit + CraftBukkit) SpigotMC/Spigot@da20125dab
Plug WorldMap Memory Leak SpigotMC/Spigot@da20125dab
 2014-08-08 17:15:42 -05:00
Zach Brown
c08319bf13 Update from upstream SpigotMC 
Fix LEFT_CLICK_AIR detection when not in creative SpigotMC/Spigot@883534a72a
 2014-08-07 14:33:06 -05:00
Zach Brown
dca3a3b021 Update from upstream SpigotMC 
Fixed: Check cast SpigotMC/Spigot@7efa75c63a
 2014-08-06 18:16:23 -05:00
Zach Brown
27e94ec67b Update from upstream SpigotMC 
Fix timings SpigotMC/Spigot@7d79f6bf5e
Fix the particle api using the wrong Material class SpigotMC/Spigot@f5a1e7a96f
 2014-08-05 13:44:19 -05:00
Zach Brown
557a65eb3c Update CraftBukkit 2014-08-04 15:11:38 -05:00
Zach Brown
5ee589911c Upsteam fix missed diff from MC 1.3.1 Update 
SpigotMC/Spigot@2e45f5d2fa
 2014-08-01 03:51:48 -05:00
Zach Brown
1d84acbcff Update from upstream SpigotMC 
Merge the max health attribute patch into the previous one SpigotMC/Spigot@8d45fe7f77
Filter attribute modifiers which cause the attribute to go out of its range SpigotMC/Spigot@463a1eb595
 2014-07-31 19:16:47 -05:00
Zach Brown
7cab612cfb Update from upstream SpigotMC 
Skip online mode UUID lookups when in offline mode and not using Bungee. SpigotMC/Spigot@25b673fd7e
 2014-07-30 03:39:03 -05:00
Byteflux
aeead930a1 Better nerf for TNT Cannons ... 
Drops the item
Applies to all Falling Block Entities
 2014-07-30 03:35:32 -05:00
Zach Brown
df10dcf656 Update from upstream SpigotMC 
Set the minimum max health attribute value to 0.1 SpigotMC/Spigot@d3b9fa0d1f
Add an option for a global cache for any request on Mojang's api SpigotMC/Spigot@3452c620df
Handle cases where the api fails to return a profile SpigotMC/Spigot@6a6eff3319
 2014-07-29 14:59:47 -05:00
Zach Brown
03ff104849 Update from upstream SpigotMC 
Allow Attribute Capping. SpigotMC/Spigot@fb3a9d38dd
Fix unit tests (broken in the above) SpigotMC/Spigot@1e98f1161f
Update attribute maxes again once loaded SpigotMC/Spigot@2bf4481e15
 2014-07-28 03:00:45 -05:00
Zach Brown
6d67f53a26 Fix CraftBukkit-Patches/0032 that got mangled in the upstream update 2014-07-27 14:26:04 -05:00
Zach Brown
398f6983bd Update from upstream SpigotMC 
Make "moved too quickly" limit configurable SpigotMC/Spigot@99a0a640e8
Undeprecate Player#updateInventory()V SpigotMC/Spigot@5c32e1cb48
Fetch complete profile for skull items, similarly to TileEntitySkull. SpigotMC/Spigot@33d758773e
Move getDouble into the Spigot Configuration patch SpigotMC/Spigot@b5dd202af1
Add missing particle to particle API SpigotMC/Spigot@273c64bbad
Log debug levels to the log file. SpigotMC/Spigot@348eae75f4
Fix PlayerItemDamageEvent (we already had this #badupstreamrelations) SpigotMC/Spigot@e207ea23cd
Move hopper patch to top for PR180 SpigotMC/Spigot@abb775108d
Don't be so spammy on Java 6 SpigotMC/Spigot@5abb82b1ca
Apply NBTReadLimiter to more things SpigotMC/Spigot@408944e9f5
 2014-07-27 14:20:28 -05:00
Zach Brown
7dd671146d Update from upstream SpigotMC 
Don't use Bukkit.getLogger as the CraftServer isn't loaded at this point SpigotMC/Spigot@5c48793ecf
Modify the block placement limit to allow for the odd random packet or two SpigotMC/Spigot@7768676ae2
 2014-07-24 22:21:57 -05:00
Zach Brown
a5c9b31256 Update from upstream SpigotMC 
No need to wait for the conversation to finish SpigotMC/Spigot@67b502b6f8
 2014-07-23 10:56:36 -05:00
Zach Brown
4aef5602d5 Update from upstream SpigotMC 
Remove defensive copy in EAR SpigotMC/Spigot@f1ba1f6c07
Make "moved wrongly limit" configurable SpigotMC/Spigot@f7ab380e16
Fix null Tile Entity Worlds (we already had this) SpigotMC/Spigot@b271cdbfa0
Fix slow tab complete for some commands SpigotMC/Spigot@f3b7952c73
Only suggest ops to deop and remove whitelist add case entirely SpigotMC/Spigot@0e1fcfbe70
Allow tab complete for /whitelist add SpigotMC/Spigot@27f8aa22bd
 2014-07-22 15:25:09 -05:00
Zach Brown
7b0c576798 Restructure PaperSpigot as a new set of modules 
Allows us much greater control over the Spigot portion of the code
and makes us more "proper"
Credit to @Dmck2b for originally passing the idea along a while back
 2014-07-21 15:46:54 -05:00
Zach Brown
b2ec959ec7 Upstream - Classloader changes and interact limiter changes 2014-07-16 14:11:44 -05:00
Zach Brown
56df661368 Configurable delay for mob AI targetting 
Allows for interesting gameplay elements and other interesting tweaks
 2014-07-14 01:24:09 -05:00
Zach Brown
489e293d69 Upstream - Don't overwrite invalid config files 2014-07-12 19:38:57 -05:00
Zach Brown
604d0e801d Upstream - Don't crash when a skele shoots an item frame 2014-07-11 08:17:54 -05:00
Zach Brown
5c711db6f1 Restore our earlier and simpler TNT direction bias fix 2014-07-11 03:57:06 -05:00
Iceee
1ffb628a78 Don't tick chests v3 - Now with more not-ticking 
As always, thanks Ice
 2014-07-11 01:57:39 -05:00
Zach Brown
2352f9cadd Use CraftBukkit's damage API fix instead of our own 
... here's hoping theirs works
 2014-07-10 21:47:05 -05:00
Dmck2b
9e2cc27fb0 Actually fix the spawn chunks persistence patch 2014-07-10 13:47:43 -05:00
Zach Brown
f23a372321 Revert "Update spawn chunk persistence patch" 
This reverts commit 27494d6d9f.
 2014-07-09 23:46:54 -05:00
Dmck2b
27494d6d9f Update spawn chunk persistence patch 2014-07-09 22:06:09 -05:00
Zach Brown
832f7ad2c3 Configurable nerf for TNT cannons 2014-07-09 17:40:03 -05:00
Zach Brown
56c2ba6437 Replace TNT fix with less buggy solution 
... although the last one was pretty funny
 2014-07-09 17:07:26 -05:00
Iceee
b848676e2f Don't tick chests v2 2014-07-08 22:56:08 -05:00
Zach Brown
66dd81d53a Better EULA handling 2014-07-08 22:40:26 -05:00
Zach Brown
f125630ef1 PaperSpigot 1.7.10 2014-07-08 22:05:35 -05:00
Aikar
0e9f7b049f Revert Bukkit damage API changes 2014-07-08 19:31:45 -05:00
Zach Brown
cfd51ccfb9 Revert updates to TNT bias patch 2014-07-08 19:28:16 -05:00
Evan A. Haskell
3a120c167c Fix null tile entity worlds crashing the server 2014-07-08 18:26:32 -05:00
Dmck2b
74692cfcd3 Allow toggling of chunk persistance 2014-07-09 00:00:00 +01:00
Zach Brown
8d8bbf09ec Update TNT directional bias patch 
Includes work by SportBukkit - Thanks guys
 2014-07-08 16:31:38 -05:00
Zach Brown
e75a3020e5 Upstream merge 2014-07-08 16:10:12 -05:00
Zach Brown
bba86b10b2 Experimental: Don't tick chests 
This isn't used anywhere and only adds to the load. This change should be considered experiemental however as it needs testing
 2014-07-07 16:29:19 -05:00
Dmck2b
42744f8853 Add configurable despawn ranges for living entities 2014-07-06 22:23:20 -05:00
gsand
64863c09c3 Player Exhaustion Multipliers 2014-07-06 19:19:11 -05:00
Zach Brown
a1c77b4f20 Upstream merge - Revert player ticking in main loop 2014-07-06 19:16:34 -05:00
Zach Brown
d9bc079038 Restore gsand's name to this patch :) 2014-07-06 02:50:09 -05:00
Zach Brown
04b7baf758 Remove patch 0012 hunger mulitplier for sprint jump 
Newer and better patch coming soon
cc @gsand
 2014-07-06 02:47:46 -05:00
Zach Brown
41a98e8541 Let's not check the config value every time 
Once is enough
 2014-07-06 01:50:02 -05:00
Zach Brown
0976e9a02a Make players tick in main loop "feature" configurable 
Defaults to false, servers thant additional security and peace of mind can turn it back on but doing so may cause gameplay abnormalities
 2014-07-05 22:55:30 -05:00
Dmck2b
7711f9fc8a Make JSON errors more user friendly and less crash prone 2014-07-05 14:54:21 -05:00
Dmck2b
1c632afdd1 Add more information and instructiions to some world crashes/issues 2014-07-05 14:47:42 -05:00
Zach Brown
3709c87cb8 Upstream merge - remove movement limit 2014-07-03 23:21:36 -05:00
Zach Brown
31a917241b Configurable movement limit restriction 2014-07-03 19:29:30 -05:00
Zach Brown
b82fe3a901 Configurable interaction limit restriction 2014-07-03 00:57:36 -05:00
Zach Brown
503d0a4dbb Move our config options out of spigot.yml and into paper.yml 2014-07-02 22:57:47 -05:00
Zach Brown
3471a29b6e Allow nerfed mobs to jump 
Unbreaks quite a few spawner grinders
 2014-06-29 13:34:16 -05:00
Zach Brown
53192b8cac Configurable fishing time ranges 2014-06-29 13:33:49 -05:00
Zach Brown
26539d2f17 Revert "Remove 0017 - potentially causing issues on respawn with plugins" 
Turned out this wasn't the issue
 2014-06-28 17:38:47 -05:00
Zach Brown
f78b1cd8d4 Remove 0017 - potentially causing issues on respawn with plugins 2014-06-28 16:57:35 -05:00
Zach Brown
46bae13502 Fix zombie sieges and their spawn mechanics 2014-06-24 22:56:20 -05:00
Zach Brown
1207bc585d Apply our patches over Spigot-Server and Spigot-API directly 2014-06-24 08:04:20 -05:00
Iceee
84046eaf04 Actually fix TNT movement 2014-06-24 00:05:59 -05:00
T00thpick1
0594b19b80 Do not remove player in world change 
Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094
 2014-06-23 21:40:02 -05:00
Zach Brown
fad5e2de6e Update patch numbers 2014-06-22 15:55:54 -05:00
Zach Brown
c86909f03b Ability to disable asynccatcher 2014-06-22 15:50:22 -05:00
Iceee
ffa3ec602f Fix redstone lag issues 2014-06-22 15:49:15 -05:00
Iceee
aedab4b551 Fix movement inconsistencies 2014-06-22 15:48:05 -05:00
Zach Brown
95151481dc Add 1.8 recipes for stone variants 2014-06-22 15:45:06 -05:00
gsand
a635610b71 Inverted Daylight Detector Toggle 2014-06-22 15:44:33 -05:00
gsand
3969291a8c Configurable hunger multiplier for player sprint jumping 2014-06-22 15:43:08 -05:00
Zach Brown
40827edab9 Make destroyed boats drop the boat item 2014-06-22 15:41:56 -05:00
Zach Brown
c49327edc5 Configurable baby zombie movement speed 2014-06-22 15:41:01 -05:00
Zach Brown
30928dda11 Configurable cactus and reed natural growth heights 2014-06-22 15:38:49 -05:00
Zach Brown
0ea4034391 Configurable damage multiplier for PvP blocking 2014-06-22 15:38:17 -05:00
Zach Brown
6ea3c4987f Add float methods to configs 2014-06-22 15:37:12 -05:00
Zach Brown
adf7f18a6b Configurable squid spawn ranges 2014-06-22 15:32:38 -05:00
Zach Brown
d06298ed68 Invisible players don't have rights 2014-06-22 15:30:53 -05:00
Aikar
474b3dbe82 Teleport passenger/vehicle with player 2014-06-22 15:29:07 -05:00
Zach Brown
4992d1dd9b Allow undead horse types to be leashed 2014-06-22 15:26:31 -05:00
Suddenly
62ae1a679c Prevent null hopper owners crashing the server 2014-06-22 15:24:36 -05:00
gsand
b9179a0a04 Rename to PaperSpigot 2014-06-22 15:22:17 -05:00
md_5
e46e6c46a1 Upstream merge, lots of conflicts 2014-06-22 19:28:17 +10:00
md_5
463e6f351e Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it. 2014-06-21 16:30:09 +10:00
md_5
b4f8ae96a2 Prevent Unbounded IntCache Growth 
Based on work by Peter Lawrey, this commit prevents unbounded growth of the integer cache and instead caps it to a value specified in the configuration (1024 by default). Should prevent thrashing, especially around world generation.
 2014-06-20 19:40:55 +10:00
Thinkofdeath
7f6d9d1fb7 Fix the restart command sometimes deadlocking the server 2014-06-14 16:01:05 +01:00
md_5
f2c8426b20 Revert LongHash changes 2014-06-11 21:07:22 +10:00
md_5
8d19f7fc9c Improve lsw too 2014-06-09 19:04:53 +10:00
Antony Riley
a9bcec2567 Improve LongHash performance - take #2 2014-06-09 18:58:20 +10:00
md_5
0dc2b96f20 Revert "Improve LongHash performance." 
This reverts commit 1705259934.
 2014-06-09 18:28:38 +10:00
Antony Riley
1705259934 Improve LongHash performance. 2014-06-09 17:52:31 +10:00
Thinkofdeath
27cb8a7e6d Upstream merge 2014-06-02 15:38:03 +01:00
Thinkofdeath
b572a59936 Fix some missed cases with data value blocking 
The item and block forms of double plants have different rules
 2014-05-30 20:28:14 +01:00
Evan A. Haskell
5daa7e5418 Better comments on hopper tick patch 2014-05-30 13:11:07 +10:00
Thinkofdeath
57147d925c Improve the data value filter to cover item stacks as well 2014-05-28 13:51:53 +01:00
md_5
ae34175e3d Upstream merge 2014-05-27 17:40:02 +10:00
md_5
95e4d28a35 Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now 2014-05-25 14:40:33 +10:00
drXor
551c6c2dd9 Add config option for when UserCache saves 2014-05-24 17:20:02 +10:00
md_5
1b946aa470 Oops: Fix compile 2014-05-24 17:17:32 +10:00
Evan A. Haskell
32f41dfe9a Add alternative hopper ticking 
This change offers a config option intending to improve hopper ticking performance while maintaining vanilla hopper behavior. Rather than polling each hopper each tick, this alternative method relies on inventory changes and redstone updates to schedule a hopper tick.
 2014-05-24 17:16:57 +10:00
md_5
1bbcf1c272 Add an API to restart with a specific script. 2014-05-24 17:10:15 +10:00
Thinkofdeath
7fcaf3f2c7 Correct formatting of the "Configurable UserCache cap" patch 2014-05-23 23:07:20 +01:00
Thinkofdeath
6cd2b27743 Fix a ConcurrentModificationException in the antixray 2014-05-21 12:05:08 +01:00
Thinkofdeath
1188b53bae Modify the async skull converter to work around a client bug 2014-05-17 09:26:14 +01:00
riking
294c4d530f Process conversation input on the main thread. BUKKIT-5611 2014-05-15 18:25:25 +10:00
md_5
e052eada8c Upstream merge: conflict resolution and version bump 2014-05-15 17:05:45 +10:00
Thinkofdeath
65b083577b Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream 2014-05-14 14:05:42 +01:00
Thinkofdeath
e21770a060 Upstream merge 2014-05-14 14:02:09 +01:00
Thinkofdeath
fbdc043a85 Remove the null world/locations patches 
These isn't help catch the plugin causing the issues and actually broke some plugins in the process
 2014-05-13 14:03:01 +01:00
Thinkofdeath
1f827c35b8 Correct // Spigot comment 2014-05-11 11:28:57 +01:00
Thinkofdeath
a0fba09ac1 Don't fire PlayerPortalEvent when we don't have a target 2014-05-11 11:25:42 +01:00
CodeCrafter47
98272bf282 fixed file extension for offline mode player data 
added ".dat" file extension so this is able to find a players offline mode data if available
 2014-05-11 12:04:57 +10:00
Thinkofdeath
6d0b39bc76 Check the right banlist for ip bans 2014-05-07 23:34:41 +01:00
hauno
531071af97 Adds a fix for Scores that can potentially crash clients. 2014-05-07 16:28:25 +10:00
ninja
124d44473c Add PlayerSpawnLocationEvent - API & implementation. 2014-05-06 16:14:49 +10:00
md_5
2031db9986 Rebuild patches from last few PRs 2014-05-06 16:10:35 +10:00
drXor
9525c226d3 Add config option for the size cap of UserCache. 2014-05-06 16:10:17 +10:00
David
4d2b4b4822 Use different replacement blocks for normal, nether and end worlds in Orebfuscator 2014-05-06 16:07:25 +10:00
Zach Brown
928f6e1ea3 Automatically set connection throttle for bungee configurations 2014-05-06 16:05:07 +10:00
Thinkofdeath
57ffba423f Remove the "Allow skull owners to be removed" patch as it was fixed upstream 2014-05-04 12:38:30 +01:00
md_5
38e8d2b53c Upstream merge: possibly fix some head related bugs. 2014-05-04 10:22:14 +10:00
Thinkofdeath
e24ab2a11f Upstream merge: Fix ender crystal stack overflow 2014-05-03 23:29:47 +01:00
Jonas Konrad
dda042aca8 Fix race condition that could kill connections before they 
were initiated
 2014-05-02 20:11:54 +10:00
Thinkofdeath
5d4ed8047a Upstream merge: Chicken jockey despawning and generation fixes 2014-04-30 15:13:37 +01:00
Thinkofdeath
06bfcd26fb Allow skull owners to be removed 2014-04-30 12:51:07 +01:00
Thinkofdeath
b30f0b69c6 Remove a file that snuck in to the last commmit 2014-04-29 09:30:17 +01:00
Thinkofdeath
e161d2f0cb Disable Watchdog when restarting 2014-04-29 09:24:36 +01:00
md_5
7af31d2942 Revert "Merge pull request #155 from yawkat/killed-connections-fix" 
This reverts commit ce42d88219, reversing
changes made to c3eeab45cd.
 2014-04-27 10:52:18 +10:00
Jonas Konrad
f48f848b81 Fix race condition that could kill connections before they 
were initiated
 2014-04-25 23:49:04 +02:00
Thinkofdeath
c3eeab45cd Fix hoppers replacing the items with the left overs from removing instead taking the items off the stack 2014-04-24 20:49:29 +01:00
Thinkofdeath
3139af91dc Fix broken hopper logic when moving more than one item in a stack 2014-04-24 20:07:39 +01:00