SteamWar/Paper
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,137 Commits 3 Branches 0 Tags
49575a06578b30f6b812fe04930c94de044f353c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Spigot 9ab31295a9 Upstream merge, lots of conflicts 
By: md_5 <git@md-5.net>
 2014-06-22 19:25:10 +10:00
Spigot 07a1436667 Shave nearly 2mb off jar size by not embedding our copy of trove since Minecraft now includes it. 
By: md_5 <git@md-5.net>
 2014-06-21 16:30:09 +10:00
Spigot 9bb3f58321 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.

By: md_5 <git@md-5.net>
 2014-06-20 19:40:55 +10:00
Spigot 144b5d87ad Fix the restart command sometimes deadlocking the server 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-06-14 16:01:05 +01:00
Spigot 07fd489dba Revert LongHash changes 
By: md_5 <git@md-5.net>
 2014-06-11 21:07:04 +10:00
Spigot 0b0db2764d Improve lsw too 
By: md_5 <git@md-5.net>
 2014-06-09 19:04:53 +10:00
Spigot 5ff5e57afe Improve LongHash performance - take #2 
By: Antony Riley <antony@cyberiantiger.org>
 2014-06-09 17:52:31 +10:00
Spigot 616f3db245 Revert "Improve LongHash performance." 
This reverts commit d81714641a.

By: md_5 <git@md-5.net>
 2014-06-09 18:28:38 +10:00
Spigot d81714641a Improve LongHash performance. 
By: Antony Riley <antony@cyberiantiger.org>
 2014-06-09 17:52:31 +10:00
Spigot 226c6d1ef0 Upstream merge 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-06-02 15:38:03 +01:00
Spigot 717840f3ee Fix some missed cases with data value blocking 
The item and block forms of double plants have different rules

By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-30 20:28:14 +01:00
Spigot 324d52d835 Better comments on hopper tick patch 
By: Evan A. Haskell <eah2119@gmail.com>
 2014-05-30 13:11:07 +10:00
Spigot b5b6004afc Improve the data value filter to cover item stacks as well 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-28 13:51:53 +01:00
Spigot 23c4e709bc Upstream merge 
By: md_5 <git@md-5.net>
 2014-05-27 17:40:02 +10:00
Spigot 955a0fb081 Replace typing yes into the console with a 10 second wait - most have updated or are aware of the changes by now 
By: md_5 <git@md-5.net>
 2014-05-25 14:40:33 +10:00
Spigot 2320f26e6d Add config option for when UserCache saves 
By: drXor <mcyoungsota@gmail.com>
 2014-05-22 09:01:33 -04:00
Spigot ffcacf7488 Oops: Fix compile 
By: md_5 <git@md-5.net>
 2014-05-24 17:17:32 +10:00
Spigot dcf15e682a 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.

By: Evan A. Haskell <eah2119@gmail.com>
 2014-05-22 13:32:42 -04:00
Spigot 8148a6fa63 Add an API to restart with a specific script. 
By: md_5 <git@md-5.net>
 2014-05-24 17:10:15 +10:00
Spigot 521863d9c4 Correct formatting of the "Configurable UserCache cap" patch 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-23 23:07:20 +01:00
Spigot c37f92e34d Fix a ConcurrentModificationException in the antixray 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-21 12:01:10 +01:00
Spigot 1fc8df93b1 Modify the async skull converter to work around a client bug 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-17 09:26:14 +01:00
Spigot 918e61ac28 Process conversation input on the main thread. BUKKIT-5611 
By: riking <rikingcoding@gmail.com>
 2014-05-14 14:12:19 -07:00
Spigot 77c0da2f07 Upstream merge: conflict resolution and version bump 
By: md_5 <git@md-5.net>
 2014-05-15 17:05:45 +10:00
Spigot b86bbe69d4 Remove 'Normalize spaces on when reading a chat packet' as it was fixed upstream 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-14 14:05:42 +01:00
Spigot 51faa817d1 Upstream merge 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-14 14:02:09 +01:00
Spigot d54d6ad87d Remove the null world/locations patches 
These isn't help catch the plugin causing the issues and actually broke some plugins in the process

By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-13 14:03:01 +01:00
Spigot e8251439f6 Upstream merge 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-13 11:20:11 +01:00
Spigot bfc95c77ae Correct // Spigot comment 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-11 11:28:57 +01:00
Spigot dbad9c674f Don't fire PlayerPortalEvent when we don't have a target 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-11 11:25:42 +01:00
Spigot c666e9b025 Check the values passed into the constructor as well 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-11 10:10:48 +01:00
Spigot 0380d405c5 Check for plgins setting null locations/worlds 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
 2014-05-11 10:04:58 +01:00
Spigot a7d58d74c9 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

By: CodeCrafter47 <Flo.e3@gmx.de>
 2014-05-10 22:47:41 +02:00
Spigot 483c0d16d0 Check the right banlist for ip bans 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-05-07 23:34:41 +01:00
Spigot b422177286 Adds a fix for Scores that can potentially crash clients. 
By: hauno <imhauno@gmail.com>
 2014-05-06 18:04:25 -07:00
Spigot 8cffa3d88d Add PlayerSpawnLocationEvent - API & implementation. 
By: ninja <xninja@openmailbox.org>
 2014-04-08 14:06:25 +02:00
Spigot 34c09ee545 Rebuild patches from last few PRs 
By: md_5 <git@md-5.net>
 2014-05-06 16:10:35 +10:00
Spigot 92d543934d Add config option for the size cap of UserCache. 
By: drXor <mcyoungsota@gmail.com>
 2014-04-25 18:19:00 -04:00
Spigot c1aa0f2704 Use different replacement blocks for normal, nether and end worlds in Orebfuscator 
By: David <dmck2b@gmail.com>
 2014-04-26 13:52:20 +01:00
Spigot ed5cd5509d Automatically set connection throttle for bungee configurations 
By: Zach Brown <Zbob750@live.com>
 2014-05-04 22:59:31 -05:00
Spigot b595aa7880 Remove the "Allow skull owners to be removed" patch as it was fixed upstream 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-05-04 12:38:30 +01:00
Spigot 50fd4d27f1 Upstream merge: possibly fix some head related bugs. 
By: md_5 <git@md-5.net>
 2014-05-04 10:22:14 +10:00
Spigot 70c8ad6011 Upstream merge: Fix ender crystal stack overflow 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-05-03 23:29:47 +01:00
Spigot 62fde18d1e Fix race condition that could kill connections before they 
were initiated

By: Jonas Konrad <me@yawk.at>
 2014-04-25 23:49:04 +02:00
Spigot 5f09e7b594 Upstream merge: Chicken jockey despawning and generation fixes 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-30 15:13:37 +01:00
Spigot d5a12c4949 Allow skull owners to be removed 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-30 12:51:07 +01:00
Spigot 8167a3bf19 Remove a file that snuck in to the last commmit 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-29 09:30:17 +01:00
Spigot d7b3486597 Disable Watchdog when restarting 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-29 09:24:36 +01:00
Spigot ae7cef7135 Revert "Merge pull request #155 from yawkat/killed-connections-fix" 
This reverts commit 5614cb1f44, reversing
changes made to 6c609c5ffe.

By: md_5 <git@md-5.net>
 2014-04-27 10:52:18 +10:00
Spigot 5614cb1f44 Merge pull request #155 from yawkat/killed-connections-fix 
Fix race condition that could kill connections before they were initiated
By: thinkofdeath <thinkofdeath@users.noreply.github.com>
 2014-04-25 23:06:07 +01:00
Spigot 1d84e93c38 Fix race condition that could kill connections before they 
were initiated

By: Jonas Konrad <me@yawk.at>
 2014-04-25 23:49:04 +02:00
Spigot 6c609c5ffe Fix hoppers replacing the items with the left overs from removing instead taking the items off the stack 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-24 20:49:29 +01:00
Spigot 213d41a3fe Fix broken hopper logic when moving more than one item in a stack 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-24 20:07:39 +01:00
Spigot b56d35552d Upstream merge 
By: md_5 <git@md-5.net>
 2014-04-24 16:27:12 +10:00
Spigot a8030addd9 Actually remove the old patches 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-23 12:48:39 +01:00
Spigot 3309f466e2 Remove NBTTagCompound and related patches 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-23 12:44:02 +01:00
Spigot 6304013c92 Silence skull related console spam 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-23 10:29:21 +01:00
Spigot c8df293dc3 Remove a line that would otherwise just be reiterating a set int 
By: David <dmck2b+github@gmail.com>
 2014-04-23 02:04:25 +01:00
Spigot ae00c5f8b6 Prevent anvils from eating the spare items in the second slot 
By: David <dmck2b+github@gmail.com>
 2014-04-23 01:05:25 +01:00
Spigot 652addd44c Merge pull request #152 from Dmck2b/crashNoClassDefStopTheLockup 
Prevent console lockup due to physics overload by only notifying on crash
By: thinkofdeath <thinkofdeath@users.noreply.github.com>
 2014-04-21 13:08:35 +01:00
Spigot ad36fb0482 Prevent the console from locing up, due to too many messages flooding it, but only notifing of issue of the server crashes 
By: David <dmck2b+github@gmail.com>
 2014-04-21 12:56:06 +01:00
Spigot df297a84cd Swallow StackOverflowError when updating physics. 
Prevents an otherwise unneeded crash.

By: David <dmck2b@gmail.com>
 2014-04-21 17:01:24 +10:00
Spigot 80d7c3be44 Convert player skulls async 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-20 13:05:17 +00:00
Spigot db03276a1c Don't special case 'invalid' usernames for UUIDs. 
This renders any automatically generated username to have the same UUID, thus make pseudo players somewhat limited. When using such names for scoreboards etc you should be using our enhanced String based scoreboard API anyway.
Thanks @ElgarL for pointing this out.

By: md_5 <git@md-5.net>
 2014-04-20 18:59:04 +10:00
Spigot 02044b4c35 Log null TileEntity Owner. 
Should prevent a crash and provide some info on the location.

By: md_5 <git@md-5.net>
 2014-04-20 11:17:14 +10:00
Spigot a7b041f721 Add items per tick to the hopper configurations 
By: md_5 <git@md-5.net>
 2014-04-19 09:22:44 +10:00
Spigot f8ca6ed867 More upstream merge 
By: md_5 <git@md-5.net>
 2014-04-19 09:15:23 +10:00
Spigot 1752ff24d2 Treat color codes as an end of a url 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-18 19:27:20 +00:00
Spigot 804a818172 Upstream merge 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-18 17:08:19 +00:00
Spigot 1f1443ed34 Upstream merge: 1.7.9 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-17 20:47:40 +01:00
Spigot 6bbb74e114 Stop player skull's name being incorrectly set to the profiles's toString 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-17 13:02:29 +01:00
Spigot 9e7add3195 Add Score.isScoreSet()Z API. 
Also fix generics on CraftScore.getScore()I.

By: md_5 <git@md-5.net>
 2014-04-17 19:36:09 +10:00
Spigot 88f93937bb Expand team API to allow arbitrary strings. 
By: md_5 <git@md-5.net>
 2014-04-17 19:22:33 +10:00
Spigot df0b4f3094 Fix BanList command and other *list functionality 
By: md_5 <git@md-5.net>
 2014-04-17 19:03:00 +10:00
Spigot 1d3e9c4268 Disable BanList Command 
Does not currently work correctly.

By: md_5 <git@md-5.net>
 2014-04-17 14:33:47 +10:00
Spigot 5e0dbddc90 Convert Horses owner to UUID 
By: Aikar <aikar@aikar.co>
 2014-04-16 16:14:26 +10:00
Spigot f5c46c5df4 Correct Ban Expiration 
By: md_5 <git@md-5.net>
 2014-04-16 11:14:49 +10:00
Spigot 71c7a386dd Fix ban expire dates. 
By: md_5 <git@md-5.net>
 2014-04-16 10:10:38 +10:00
Spigot b2824c66ae Print stack only when debug is enabled 
By: md_5 <git@md-5.net>
 2014-04-16 10:00:53 +10:00
Spigot c22ab5cf24 Validate CraftSkull getOwner - prevents it from being called when hasOwner is false. 
By: md_5 <git@md-5.net>
 2014-04-16 09:47:03 +10:00
Spigot 16d77f8f5e Allow non hidden update lock 
By: md_5 <git@md-5.net>
 2014-04-15 19:28:39 +10:00
Spigot 6e5b0c8d67 Fix EditBook Event 
By: mrapple <tony@oc.tc>
 2014-04-15 12:17:49 +10:00
Spigot aff3d19f1e Remove whitelist fix patch, pulled upstream & also slightly incorrect, userCache.a() does not perform a full lookup. 
By: md_5 <git@md-5.net>
 2014-04-15 12:03:38 +10:00
Spigot 3b83830fde Check Skull canPlace - ensures skulls are only placed where they are supposed to. 
By: md_5 <git@md-5.net>
 2014-04-15 10:48:55 +10:00
Spigot 79a14f8a9f Fix Player Banning 
This issue stems from the fact that Bukkit's API only allows a UUID to be banned, but Minecraft requires both a UUID and name. To fix this we modify the code to require a UUID or a name, or both. The correct fix would be expanding the API to be able to provide a name, however this would require plugin changes.

By: md_5 <git@md-5.net>
 2014-04-15 10:32:55 +10:00
Spigot 1459bac6ab Fix despawn rate to be >= 
By: md_5 <git@md-5.net>
 2014-04-15 09:37:11 +10:00
Spigot fc1c85c557 Fix arrows and fireworks not having their despawn counters ticked when inactive 
By: Thinkofdeath <thethinkofdeath@gmail.com>
 2014-04-14 17:22:45 +01:00
Spigot 7e47bcee43 Set shell prompt to $ when running the patch scripts, helps with speed on windows. 
By: md_5 <git@md-5.net>
 2014-04-14 21:01:27 +10:00
Spigot 438e72389e Check for Blank OfflinePlayer Names - the internal representation does not allow them, so lets catch it early when the issue lies with the user. 
By: md_5 <git@md-5.net>
 2014-04-14 17:22:57 +10:00
Spigot ee2e753ae4 Add note about BungeeCord 
By: md_5 <git@md-5.net>
 2014-04-14 14:55:06 +10:00
Spigot d1ca9def1a Upstream merge 
By: md_5 <git@md-5.net>
 2014-04-14 14:35:27 +10:00
Spigot 625577148a Add skin forwarding support for BungeeCord. 
By: Fabian Fassbender <fabian.fassbender42@googlemail.com>
 2014-04-14 11:41:45 +10:00
Spigot a2ba6dd10d Prevent crash from a ConversationTracker exception. Fixes BUKKIT-5436 
By: Devin Ryan <devin@forairan.com>
 2014-04-13 16:12:17 -05:00
Spigot 5f889e2cf5 Add obfuscation helper patch to assist update process. 
By: md_5 <git@md-5.net>
 2014-04-14 10:40:29 +10:00
Spigot b6ad1541ce Use Provided Case for Non Existent Offline Players. 
Fixes issues with using scoreboards to provide information via pseudo players being all lower cased.

By: md_5 <git@md-5.net>
 2014-04-14 09:47:44 +10:00
Spigot 3ffe018032 Properly cancel fishing event. Fixes BUKKIT-5396 
Previously, when cancelling a PlayerFishEvent with State.FISHING, the next
fishing attempt would automatically result in a new PlayerFishEvent with
State.FAILED_ATTEMPT because the player's hooked entity was not properly
cleared. This ensures that the player's hooked entity value is set to null so
that the next attempt will result in the proper state being called.

By: gjmcferrin@gmail.com <gjmcferrin@gmail.com>
 2014-04-13 20:13:56 +10:00
Spigot c739e5da15 Fix PlayerFishEvent not properly cancelling. Fixes 
BUKKIT-5245,BUKKIT-5396

PlayerFishEvent event states are not properly being cancelled,
the FishingHookEntity being deleted when the event is cancelled,
thus making the event happen. The event states of CAUGHT_ENTITY,
CAUGHT_FISH, FAILED_ATTEMPT, IN_GROUND must keep the
EntityFishingHook alive in order to cancel the event.
Removed the entity despawn lines when event is cancelled
and added a cancelled action for FAILED_ATTEMPT state.

By: myiume <cursed_kidd@yahoo.com>
 2014-04-13 20:13:13 +10:00
Spigot 0047f8e53c Fix more missed diff - IPs not showing in console 
By: md_5 <git@md-5.net>
 2014-04-13 16:35:17 +10:00
Spigot 48f8eedf1c Use Correct firstPlayed Value. 
By: md_5 <git@md-5.net>
 2014-04-13 14:46:03 +10:00
Spigot 67d52b3915 Use Offline Player Data Once if Required. 
If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again.

By: md_5 <git@md-5.net>
 2014-04-13 14:41:33 +10:00