Compare commits

..

No commits in common. "6ff5eb15a9d2b7b2dcfe1fe30c7ab3e002830b5f" and "9d5925b4d01ef3b5933bdc5ff15af82d46d0d06c" have entirely different histories.

5 changed files with 11 additions and 11 deletions

View File

@ -36,6 +36,6 @@ maze_generator = "2"
once_cell = "1"
pathfinding = "3"
rand = "0.8"
sentry = "0.27"
sentry = "0.26"
serde = "1"
shadowcast = "0.8"

View File

@ -438,23 +438,20 @@ impl<S, A> Default for ExplorationConfig<S, A> {
}
}
pub struct ExplorationPlugin<'a, S: 'static, A: 'static, D>(
PhantomData<&'a S>,
PhantomData<&'static A>,
PhantomData<D>,
);
pub struct ExplorationPlugin<'a, S, A, D>(PhantomData<&'a S>, PhantomData<&'a A>, PhantomData<D>);
impl<S, A, D> Default for ExplorationPlugin<'static, S, A, D> {
impl<'a, S, A, D> Default for ExplorationPlugin<'a, S, A, D> {
fn default() -> Self {
Self(PhantomData, PhantomData, PhantomData)
}
}
impl<S, A, D> Plugin for ExplorationPlugin<'static, S, A, D>
impl<'a, S, A, D> Plugin for ExplorationPlugin<'a, S, A, D>
where
S: Clone + Debug + Eq + Hash + Send + Sync,
A: Hash + Eq + Clone + Send + Sync,
D: 'static + Clone + Default + Send + Sync,
'a: 'static,
{
fn build(&self, app: &mut App) {
if !app.world.contains_resource::<ExplorationConfig<S, A>>() {

View File

@ -365,10 +365,11 @@ impl<'a, S, A> Default for NavigationPlugin<'a, S, A> {
}
}
impl<S, A> Plugin for NavigationPlugin<'static, S, A>
impl<'a, S, A> Plugin for NavigationPlugin<'a, S, A>
where
S: 'static + Clone + Copy + Debug + Eq + Hash + Send + Sync,
A: Hash + Eq + Copy + Send + Sync,
'a: 'static,
{
fn build(&self, app: &mut App) {
if !app.world.contains_resource::<NavigationConfig<S, A>>() {

View File

@ -287,9 +287,10 @@ impl<'a, S> Default for SoundIconPlugin<'a, S> {
}
}
impl<S> Plugin for SoundIconPlugin<'static, S>
impl<'a, S> Plugin for SoundIconPlugin<'a, S>
where
S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
'a: 'static,
{
fn build(&self, app: &mut App) {
app.add_system(added)

View File

@ -28,9 +28,10 @@ impl<'a, S> Default for SoundPlugin<'a, S> {
}
}
impl<S> Plugin for SoundPlugin<'static, S>
impl<'a, S> Plugin for SoundPlugin<'a, S>
where
S: 'static + Clone + Debug + Eq + Hash + Send + Sync,
'a: 'static,
{
fn build(&self, app: &mut App) {
let _core_config = *app.world.get_resource::<CoreConfig>().unwrap();